Add support for touch controls in editor

Improve rendering of the 2D plane in 3D so it's not cut when rotating the camera (#7857 )
Allow the 2D plane in the 3D world to be rendered at the position "where the 3D camera is looking at" (by projecting the camera frustrum on the Z plane, with a "maximum drawing distance" to avoid a too large area). The 2D rendering texture size is not changed, so an area too big can create blurry rendering near the camera - but this is expected. In practice, 2D objects culling will limit the distance anyway of what's visible.
2025-10-15 10:19:04 +00:00 · 2025-09-28 19:15:47 +02:00 · 2025-09-27 15:33:01 +02:00 · 2025-09-26 17:48:26 +02:00 · 2025-09-26 17:45:09 +02:00 · 2025-09-26 17:45:08 +02:00
1402 changed files with 116577 additions and 35835 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -13,17 +13,18 @@ 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.
+  # Build the **entire** app for macOS (including the GDevelop.js library).
  build-macos:
    macos:
-      xcode: 14.2.0
-    resource_class: macos.m1.large.gen1
+      xcode: 16.4.0
+    resource_class: m4pro.medium
    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.
@@ -46,9 +47,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" }}
+            - 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" }}
            # 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
@@ -69,7 +70,8 @@ jobs:
            - newIDE/electron-app/node_modules
            - newIDE/app/node_modules
            - GDevelop.js/node_modules
-          key: gd-macos-nodejs-dependencies-{{ checksum "newIDE/app/package.json" }}-{{ checksum "newIDE/electron-app/package.json" }}-{{ checksum "GDevelop.js/package.json" }}
+            - 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" }}

      # 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).
@@ -86,15 +88,37 @@ jobs:
      - store_artifacts:
          path: newIDE/electron-app/dist

+
      # Upload artifacts (AWS)
      - run:
          name: Deploy to S3 (specific commit)
-          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)/
+          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
+
      - run:
          name: Deploy to S3 (latest)
-          command: export PATH=~/.local/bin:$PATH && aws s3 sync newIDE/electron-app/dist s3://gdevelop-releases/$(git rev-parse --abbrev-ref HEAD)/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

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

-      # System dependencies (for Electron Builder and Emscripten)
+      # System dependencies (for Electron Builder)
      - run:
-          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 ..
+          name: Update system dependencies
+          command: sudo apt-get update

      - 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" }}
+            - 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" }}
            # fallback to using the latest cache if no exact match is found
-            - gd-linux-nodejs-dependencies---
+            - gd-linux-nodejs-dependencies-

-      - 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)
+      # GDevelop IDE dependencies (using an exact version of GDevelop.js, built previously)
      - run:
          name: Install GDevelop IDE dependencies
-          command: cd newIDE/app && npm install && cd ../electron-app && npm install
+          command: export REQUIRES_EXACT_LIBGD_JS_VERSION=true && 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
-          key: gd-linux-nodejs-dependencies-{{ checksum "newIDE/app/package.json" }}-{{ checksum "newIDE/electron-app/package.json" }}-{{ checksum "GDevelop.js/package.json" }}
+            - 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" }}

      # Build GDevelop IDE (seems like we need to allow Node.js to use more space than usual)
      - run:
@@ -295,14 +301,203 @@ 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 all run them.
+          # Extra checks are resource intensive so don't always run them.
          filters:
            branches:
              only:
@@ -310,13 +505,36 @@ 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
@@ -0,0 +1,47 @@
+# 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,3 +33,4 @@
 .Spotlight-V100
 .Trashes
 Thumbs.db
+.claude
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -38,8 +38,7 @@
      "presentation": {
        "reveal": "silent"
      },
-      "isBackground": true,
-      "runOptions": { "instanceLimit": 1, "runOn": "folderOpen" }
+      "isBackground": true
    },
    {
      "type": "npm",
--- a/Core/GDCore/Events/Builtin/GroupEvent.cpp
+++ b/Core/GDCore/Events/Builtin/GroupEvent.cpp
@@ -61,10 +61,12 @@ void GroupEvent::UnserializeFrom(gd::Project& project,
      project, events, element.GetChild("events"));

  parameters.clear();
-  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());
+  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());
+  }
 }

 void GroupEvent::SetBackgroundColor(unsigned int colorR_,
--- a/Core/GDCore/Events/Builtin/LinkEvent.cpp
+++ b/Core/GDCore/Events/Builtin/LinkEvent.cpp
@@ -163,6 +163,21 @@ 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,6 +109,10 @@ 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
@@ -329,7 +329,6 @@ gd::String EventsCodeGenerator::GenerateConditionCode(
    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())) {
@@ -357,6 +356,11 @@ gd::String EventsCodeGenerator::GenerateConditionCode(
      }
    }
  }
+  bool isAnyBehaviorMissing =
+      gd::EventsCodeGenerator::CheckBehaviorParameters(condition, instrInfos);
+  if (isAnyBehaviorMissing) {
+    return "/* Missing behavior - skipped. */";
+  }

  if (instrInfos.IsObjectInstruction()) {
    gd::String objectName = condition.GetParameter(0).GetPlainString();
@@ -488,14 +492,16 @@ gd::String EventsCodeGenerator::GenerateConditionsListCode(
  return outputCode;
 }

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

          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);
-            if (diagnosticReport) diagnosticReport->Add(projectDiagnostic);
+            if (diagnosticReport)
+              diagnosticReport->Add(projectDiagnostic);
          }
        }
      });
+  return isAnyBehaviorMissing;
 }

 /**
@@ -552,7 +570,6 @@ gd::String EventsCodeGenerator::GenerateActionCode(
    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())) {
@@ -579,6 +596,11 @@ gd::String EventsCodeGenerator::GenerateActionCode(
      }
    }
  }
+  bool isAnyBehaviorMissing =
+      gd::EventsCodeGenerator::CheckBehaviorParameters(action, instrInfos);
+  if (isAnyBehaviorMissing) {
+    return "/* Missing behavior - skipped. */";
+  }

  // Call free function first if available
  if (instrInfos.IsObjectInstruction()) {
@@ -769,7 +791,7 @@ gd::String EventsCodeGenerator::GenerateActionsListCode(
    } else {
      outputCode += actionCode;
    }
-    outputCode += "}";
+    outputCode += "}\n";
  }

  return outputCode;
@@ -1358,12 +1380,30 @@ gd::String EventsCodeGenerator::GeneratePropertyGetter(const gd::PropertiesConta
  return "getProperty" + property.GetName() + "As" + type + "()";
 }

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

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

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

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

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

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

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

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

+  virtual gd::String
+  GenerateParameterGetterWithoutCasting(const gd::ParameterMetadata &parameter);
+
  /**
   * \brief Generate the code to reference an object which is
   * in an empty/null state.
@@ -815,7 +837,7 @@ protected:
  virtual gd::String GenerateGetBehaviorNameCode(
      const gd::String& behaviorName);

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

--- a/Core/GDCore/Events/CodeGeneration/ExpressionCodeGenerator.cpp
+++ b/Core/GDCore/Events/CodeGeneration/ExpressionCodeGenerator.cpp
@@ -135,18 +135,20 @@ void ExpressionCodeGenerator::OnVisitVariableNode(VariableNode& node) {
    EventsCodeGenerator::VariableScope scope =
        type == "variable"
            ? gd::EventsCodeGenerator::ANY_VARIABLE
-        : type == "globalvar"
-            ? gd::EventsCodeGenerator::PROJECT_VARIABLE
-            : type == "scenevar"
-                  ? gd::EventsCodeGenerator::LAYOUT_VARIABLE
-                  : gd::EventsCodeGenerator::OBJECT_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;

    auto objectName = gd::ExpressionVariableOwnerFinder::GetObjectName(codeGenerator.GetPlatform(),
                                          codeGenerator.GetObjectsContainersList(),
                                          rootObjectName,
                                          node);
    output += codeGenerator.GenerateGetVariable(
-        node.name, scope, context, objectName);
+        node.name, scope, context, objectName, node.child != nullptr);
    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.
@@ -163,7 +165,7 @@ void ExpressionCodeGenerator::OnVisitVariableNode(VariableNode& node) {
      output += codeGenerator.GenerateVariableValueAs(type);
    }, [&]() {
      output += codeGenerator.GenerateGetVariable(
-          node.name, gd::EventsCodeGenerator::ANY_VARIABLE, context, "");
+          node.name, gd::EventsCodeGenerator::ANY_VARIABLE, context, "", node.child != nullptr);
      if (node.child) node.child->Visit(*this);
      output += codeGenerator.GenerateVariableValueAs(type);
    }, [&]() {
@@ -184,8 +186,9 @@ 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);
+      output += codeGenerator.GenerateGetVariable(
+          node.name, gd::EventsCodeGenerator::OBJECT_VARIABLE, context,
+          objectNameToUseForVariableAccessor, node.child != nullptr);

      // We have accessed an object variable, from now we can continue accessing the child variables
      // (including using the bracket notation).
@@ -222,24 +225,27 @@ 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 == "globalvar"
-              ? gd::EventsCodeGenerator::PROJECT_VARIABLE
-              : type == "scenevar"
-                    ? gd::EventsCodeGenerator::LAYOUT_VARIABLE
-                    : gd::EventsCodeGenerator::OBJECT_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;

-      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);
-      }
+    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);
+    }
  } else {
    const auto& variablesContainersList = codeGenerator.GetProjectScopedContainers().GetVariablesContainersList();
    const auto& propertiesContainersList = codeGenerator.GetProjectScopedContainers().GetPropertiesContainersList();
@@ -249,12 +255,13 @@ 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, gd::EventsCodeGenerator::OBJECT_VARIABLE,
+          context, node.identifierName, !node.childIdentifierName.empty());
      output += codeGenerator.GenerateVariableValueAs(type);
    }, [&]() {
      output += codeGenerator.GenerateGetVariable(
-          node.identifierName, gd::EventsCodeGenerator::ANY_VARIABLE, context,
-          "");
+          node.identifierName, gd::EventsCodeGenerator::VARIABLE_OR_PROPERTY_OR_PARAMETER, context,
+          "", !node.childIdentifierName.empty());
      if (!node.childIdentifierName.empty()) {
        output += codeGenerator.GenerateVariableAccessor(node.childIdentifierName);
      }
--- a/Core/GDCore/Events/Event.cpp
+++ b/Core/GDCore/Events/Event.cpp
@@ -18,8 +18,6 @@ namespace gd {

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

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

  /** \name Code generation
@@ -306,6 +286,20 @@ 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>
@@ -324,11 +318,10 @@ class GD_CORE_API BaseEvent {
  bool disabled;    ///< True if the event is disabled and must not be executed
  gd::String type;  ///< Type of the event. Must be assigned at the creation.
                    ///< Used for saving the event for instance.
+  gd::String aiGeneratedEventId;  ///< When generated by an AI/external tool.

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

 /**
--- a/Core/GDCore/Events/Serialization.cpp
+++ b/Core/GDCore/Events/Serialization.cpp
@@ -221,6 +221,8 @@ 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());
  }
@@ -236,6 +238,8 @@ 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,7 +141,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAdvancedExtension(
                    "res/function32.png")
      .AddParameter("functionParameterName", _("Parameter name"), "number,string,boolean")
      .SetRelevantForFunctionEventsOnly()
-      .MarkAsAdvanced();
+      .MarkAsAdvanced()
+      .SetHidden();

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

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

 }  // 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,7 +235,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(

  obj.AddAction("SetAngle",
                _("Angle"),
-                _("Change the angle of rotation of an object (in degrees)."),
+                _("Change the angle of rotation of an object (in degrees). For "
+                  "3D objects, this is the rotation around the Z axis."),
                _("the angle"),
                _("Angle"),
                "res/actions/direction24_black.png",
@@ -250,12 +251,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
  obj.AddAction("Rotate",
                _("Rotate"),
                _("Rotate an object, clockwise if the speed is positive, "
-                  "counterclockwise otherwise."),
+                  "counterclockwise otherwise. For 3D objects, this is the "
+                  "rotation around the Z axis."),
                _("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", "")
@@ -269,7 +270,6 @@ 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,7 +285,6 @@ 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"))
@@ -304,12 +303,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");
+      .SetDefaultValue("0")
+      .SetHelpPath("/tutorials/how-to-move-objects/");

  obj.AddAction("AddForceAL",
                _("Add a force (angle)"),
@@ -321,12 +320,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(
@@ -339,13 +338,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(
@@ -360,13 +359,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",
@@ -376,8 +375,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",
@@ -418,7 +417,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
      .MarkAsAdvanced();

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

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

  obj.AddAction("SetBooleanObjectVariable",
-                _("Change boolean variable"),
+                _("Change object variable value"),
                _("Modify the boolean value of an object variable."),
                _("Change the variable _PARAM1_ of _PARAM0_: _PARAM2_"),
                _("Variables"),
@@ -458,10 +459,11 @@ 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",
-                   _("Variable value"),
+                   _("Object variable value"),
                   _("Compare the number value of an object variable."),
                   _("the variable _PARAM1_"),
                   _("Variables"),
@@ -472,10 +474,11 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
      .AddParameter("objectvar", _("Variable"))
      .UseStandardRelationalOperatorParameters(
          "number", ParameterOptions::MakeNewOptions())
+      .SetHelpPath("/all-features/variables/object-variables/")
      .SetRelevantForLayoutEventsOnly();

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

  obj.AddCondition("BooleanObjectVariable",
-                   _("Boolean variable"),
+                   _("Object variable value"),
                   _("Compare the boolean value of an object variable."),
                   _("The variable _PARAM1_ of _PARAM0_ is _PARAM2_"),
                   _("Variables"),
@@ -502,6 +506,7 @@ 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",
@@ -514,6 +519,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(

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

      .AddParameter("object", _("Object"))
      .AddParameter("objectvar", _("Variable"))
+      .SetHelpPath("/all-features/variables/object-variables/")
      .UseStandardOperatorParameters("string",
                                     ParameterOptions::MakeNewOptions())
      .SetRelevantForFunctionEventsOnly();
@@ -544,6 +551,7 @@ 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(
@@ -560,6 +568,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(

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

  obj.AddCondition("ObjectVariableChildExists",
@@ -567,24 +576,26 @@ 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",
@@ -592,11 +603,12 @@ 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",
@@ -624,7 +636,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(

  obj.AddCondition("Angle",
                   _("Angle"),
-                   _("Compare the angle of the specified object."),
+                   _("Compare the angle, in degrees, of the specified object. "
+                     "For 3D objects, this is the angle around the Z axis."),
                   _("the angle (in degrees)"),
                   _("Angle"),
                   "res/conditions/direction24_black.png",
@@ -691,8 +704,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",
@@ -702,10 +715,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
@@ -722,6 +735,7 @@ 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",
@@ -735,6 +749,7 @@ 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",
@@ -749,6 +764,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
      .AddParameter("objectvar", _("Variable"))
      .UseStandardRelationalOperatorParameters(
          "number", ParameterOptions::MakeNewOptions())
+      .SetHelpPath("/all-features/variables/object-variables/")
      .SetRelevantForFunctionEventsOnly();

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

  obj.AddCondition("ObjectVariableAsBoolean",
@@ -777,6 +794,7 @@ 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",
@@ -793,42 +811,44 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(

  obj.AddAction(
         "PushStringToObjectVariable",
-         _("Add text variable"),
+         _("Add value to object array 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 variable array value"),
+                _("Add value to object array variable"),
                _("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 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")
+  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")
      .AddParameter("object", _("Object"))
      .AddParameter("objectvar", _("Array variable"))
      .AddParameter("trueorfalse", _("Boolean to add"))
+      .SetHelpPath("/all-features/variables/structures-and-arrays/")
      .MarkAsAdvanced()
      .SetRelevantForLayoutEventsOnly();

@@ -838,7 +858,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"))
@@ -847,6 +867,7 @@ 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();

@@ -855,7 +876,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"))
@@ -864,6 +885,7 @@ 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(
@@ -871,12 +893,13 @@ 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();

@@ -884,12 +907,13 @@ 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();

@@ -898,12 +922,13 @@ 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();

@@ -914,12 +939,13 @@ 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(
@@ -927,13 +953,14 @@ 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(
@@ -941,40 +968,44 @@ 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"));
+      .AddParameter("objectvar", _("Array variable"))
+      .SetHelpPath("/all-features/variables/structures-and-arrays/");

  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"));
+      .AddParameter("objectvar", _("Array variable"))
+      .SetHelpPath("/all-features/variables/structures-and-arrays/");

  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"));
+      .AddParameter("objectvar", _("Array variable"))
+      .SetHelpPath("/all-features/variables/structures-and-arrays/");

  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"));
+      .AddParameter("objectvar", _("Array variable"))
+      .SetHelpPath("/all-features/variables/structures-and-arrays/");

  obj.AddCondition("BehaviorActivated",
                   _("Behavior activated"),
@@ -1009,12 +1040,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(
@@ -1029,13 +1060,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",
@@ -1063,10 +1094,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)");
+      .AddParameter("objectList", "Object 2 (won't move)")
+      .SetHelpPath("/tutorials/how-to-move-objects/");

  // Deprecated action
  obj.AddAction("Ecarter",
@@ -1090,7 +1121,6 @@ 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",
@@ -1099,6 +1129,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                    "",
                    true)
      .SetDefaultValue("no")
+      .SetHelpPath("/all-features/collisions/")
      .MarkAsSimple();

  obj.AddCondition("CollisionPoint",
@@ -1111,6 +1142,7 @@ 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
@@ -1142,6 +1174,7 @@ 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(
@@ -1157,6 +1190,7 @@ 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",
@@ -1168,6 +1202,7 @@ 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(
@@ -1180,7 +1215,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
         "res/actions/timer24.png",
         "res/actions/timer.png")
      .AddParameter("object", _("Object"))
-      .AddParameter("identifier", _("Timer's name"), "objectTimer");
+      .AddParameter("identifier", _("Timer's name"), "objectTimer")
+      .SetHelpPath("/all-features/timers-and-time/");

  obj.AddAction("PauseObjectTimer",
                _("Pause an object timer"),
@@ -1191,6 +1227,7 @@ 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",
@@ -1202,6 +1239,7 @@ 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",
@@ -1213,6 +1251,7 @@ 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",
@@ -1231,7 +1270,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(

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

  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"));
+      .AddParameter("object", _("Object"))
+      .SetHelpPath("/tutorials/how-to-move-objects/");

  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"));
+      .AddParameter("object", _("Object"))
+      .SetHelpPath("/tutorials/how-to-move-objects/");

  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"));
+      .AddParameter("object", _("Object"))
+      .SetHelpPath("/tutorials/how-to-move-objects/");

  obj.AddExpression("Longueur",
                    _("Length of the sum of forces"),
@@ -1270,6 +1314,7 @@ 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",
@@ -1366,10 +1411,11 @@ 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"));
+      .AddParameter("objectvar", _("Array or structure variable"))
+      .SetHelpPath("/all-features/variables/structures-and-arrays/");

  obj.AddStrExpression("VariableString",
                       _("Text variable"),
@@ -1378,6 +1424,7 @@ 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",
@@ -1386,7 +1433,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                    _("Timers"),
                    "res/actions/time.png")
      .AddParameter("object", _("Object"))
-      .AddParameter("identifier", _("Timer's name"), "objectTimer");
+      .AddParameter("identifier", _("Timer's name"), "objectTimer")
+      .SetHelpPath("/all-features/timers-and-time/");

  obj.AddExpression("AngleToObject",
                    _("Angle between two objects"),
@@ -1526,7 +1574,9 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
  extension
      .AddAction("Create",
                 _("Create an object"),
-                 _("Create an object at specified position"),
+                 _("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 object _PARAM1_ at position _PARAM2_;_PARAM3_ "
                   "(layer: _PARAM4_)"),
                 "",
@@ -1606,6 +1656,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
          "res/actions/doMove24.png",
          "res/actions/doMove.png")
      .AddCodeOnlyParameter("currentScene", "")
+      .SetHelpPath("/tutorials/how-to-move-objects/")
      .MarkAsAdvanced();

  extension
@@ -1621,6 +1672,7 @@ 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
@@ -1753,6 +1805,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                    "",
                    true)
      .SetDefaultValue("no")
+      .SetHelpPath("/all-features/collisions/")
      .MarkAsSimple();

  extension
@@ -1815,6 +1868,7 @@ 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
@@ -1846,6 +1900,7 @@ 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",
-                               _("Animatable capability"),
-                               _("Animate objects."),
+                               _("Objects with animations"),
+                               _("Actions and conditions for objects having animations (sprite, 3D models...)."),
                               "Florian Rival",
                               "Open source (MIT License)")
      .SetExtensionHelpPath("/objects");
-  extension.AddInstructionOrExpressionGroupMetadata(_("Animatable capability"))
+  extension.AddInstructionOrExpressionGroupMetadata(_("Objects with animations"))
      .SetIcon("res/actions/animation24.png");
  extension.AddInstructionOrExpressionGroupMetadata(_("Animations and images"))
      .SetIcon("res/actions/animation24.png");

  gd::BehaviorMetadata& aut = extension.AddBehavior(
      "AnimatableBehavior",
-      _("Animatable capability"),
+      _("Objects with animations"),
      "Animation",
-      _("Animate objects."),
+      _("Actions and conditions for objects having animations (sprite, 3D models...).."),
      "",
      "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",
-                               _("Effect capability"),
-                               _("Apply visual effects to objects."),
+                               _("Objects with effects"),
+                               _("Actions/conditions to enable/disable and change parameters of visual effects applied on 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",
-      _("Effect capability"),
+      _("Objects with effects"),
      "Effect",
-      _("Apply visual effects to objects."),
+      _("Actions/conditions to enable/disable and change parameters of visual effects applied on 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 capability"),
-                               _("Flip objects."),
+                               _("Flippable objects"),
+                               _("Actions/conditions for objects which can be flipped horizontally or vertically."),
                               "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 capability"),
+      _("Flippable objects"),
      "Flippable",
-      _("Flip objects."),
+      _("Actions/conditions for objects which can be flipped horizontally or vertically."),
      "",
      "res/actions/flipX24.png",
      "FlippableBehavior",
--- a/Core/GDCore/Extensions/Builtin/Capabilities/OpacityExtension.cpp
+++ b/Core/GDCore/Extensions/Builtin/Capabilities/OpacityExtension.cpp
@@ -18,27 +18,30 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsOpacityExtension(
    gd::PlatformExtension& extension) {
  extension
      .SetExtensionInformation("OpacityCapability",
-                               _("Opacity capability"),
-                               _("Change the object opacity."),
+                               _("Objects with opacity"),
+                               _("Action/condition/expression to change or "
+                                 "check the opacity of an object (0-255)."),
                               "Florian Rival",
                               "Open source (MIT License)")
      .SetExtensionHelpPath("/objects");
-  extension.AddInstructionOrExpressionGroupMetadata(_("Opacity capability"))
+  extension.AddInstructionOrExpressionGroupMetadata(_("Objects with opacity"))
      .SetIcon("res/actions/opacity24.png");
  extension.AddInstructionOrExpressionGroupMetadata(_("Visibility"))
      .SetIcon("res/actions/opacity24.png");

-  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();
+  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();

  aut.AddExpressionAndConditionAndAction(
         "number",
@@ -52,8 +55,9 @@ 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,11 +16,13 @@ namespace gd {
 void GD_CORE_API BuiltinExtensionsImplementer::ImplementsResizableExtension(
    gd::PlatformExtension &extension) {
  extension
-      .SetExtensionInformation("ResizableCapability",
-                               _("Resizable capability"),
-                               _("Change the object dimensions."),
-                               "Florian Rival",
-                               "Open source (MIT License)")
+      .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)")
      .SetExtensionHelpPath("/objects");
  extension.AddInstructionOrExpressionGroupMetadata(_("Size")).SetIcon(
      "res/actions/scale24_black.png");
@@ -28,9 +30,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsResizableExtension(
  gd::BehaviorMetadata &aut =
      extension
          .AddBehavior("ResizableBehavior",
-                       _("Resizable capability"),
+                       _("Resizable objects"),
                       "Resizable",
-                       _("Change the object dimensions."),
+                       _("Change or compare the size (width/height) of an "
+                         "object which can be resized (i.e: most objects)."),
                       "",
                       "res/actions/scale24_black.png",
                       "ResizableBehavior",
--- a/Core/GDCore/Extensions/Builtin/Capabilities/ScalableExtension.cpp
+++ b/Core/GDCore/Extensions/Builtin/Capabilities/ScalableExtension.cpp
@@ -18,27 +18,30 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsScalableExtension(
    gd::PlatformExtension& extension) {
  extension
      .SetExtensionInformation("ScalableCapability",
-                               _("Scalable capability"),
-                               _("Change the object scale."),
+                               _("Scalable objects"),
+                               _("Actions/conditions/expression to change or "
+                                 "check the scale of an object (default: 1)."),
                               "Florian Rival",
                               "Open source (MIT License)")
      .SetExtensionHelpPath("/objects");
-  extension.AddInstructionOrExpressionGroupMetadata(_("Scalable capability"))
-      .SetIcon("res/actions/scale24_black.png");
-  extension.AddInstructionOrExpressionGroupMetadata(_("Size"))
+  extension.AddInstructionOrExpressionGroupMetadata(_("Scalable objects"))
      .SetIcon("res/actions/scale24_black.png");
+  extension.AddInstructionOrExpressionGroupMetadata(_("Size")).SetIcon(
+      "res/actions/scale24_black.png");

-  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();
+  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();

  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",
-                               _("Text capability"),
-                               _("Animate objects."),
+                               _("Objects containing a text"),
+                               _("Allows an object to contain a text, usually shown on screen, that can be modified."),
                               "Florian Rival",
                               "Open source (MIT License)")
      .SetExtensionHelpPath("/objects");
-  extension.AddInstructionOrExpressionGroupMetadata(_("Text capability"))
+  extension.AddInstructionOrExpressionGroupMetadata(_("Objects containing a text"))
      .SetIcon("res/conditions/text24_black.png");

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

  extension
-      .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")
+      .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")
      .SetCanHaveSubInstructions()
      .MarkAsAdvanced();

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

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

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

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

  extension
      .AddCondition("AnyKeyPressed",
@@ -84,7 +100,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,7 +72,8 @@ 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")
@@ -124,7 +125,8 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
  extension
      .AddExpression("mod",
                     _("Modulo"),
-                     _("x mod y"),
+                     _("Compute \"x mod y\". GDevelop does NOT support the \% "
+                       "operator. Use this mod(x, y) function instead."),
                     "",
                     "res/mathfunction.png")
      .AddParameter("expression", _("x (as in x mod y)"))
@@ -151,7 +153,8 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
  extension
      .AddExpression("abs",
                     _("Absolute value"),
-                     _("Absolute value"),
+                     _("Return the non-negative value by removing the sign. "
+                       "The absolute value of -8 is 8."),
                     "",
                     "res/mathfunction.png")
      .AddParameter("expression", _("Expression"));
@@ -183,11 +186,8 @@ 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,11 +217,8 @@ 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
@@ -259,12 +256,13 @@ 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
@@ -292,29 +290,20 @@ 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
@@ -323,8 +312,8 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
                     _("Round a number to the Nth decimal place"),
                     "",
                     "res/mathfunction.png")
-      .AddParameter("expression", _("Expression"))
-      .AddParameter("expression", _("Expression"), "", true);
+      .AddParameter("expression", _("Number to Round"))
+      .AddParameter("expression", _("Decimal Places"), "", true);

  extension
      .AddExpression("exp",
@@ -335,19 +324,13 @@ 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"));

@@ -386,11 +369,8 @@ 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
@@ -402,12 +382,13 @@ 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
@@ -427,12 +408,13 @@ 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
@@ -462,26 +444,28 @@ 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"));

@@ -496,7 +480,8 @@ 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,8 +16,11 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(
      .SetExtensionInformation(
          "BuiltinMouse",
          _("Mouse and touch"),
-          "Conditions and actions to handle either the mouse or touches on "
-          "touchscreen. By default, conditions related to the mouse will also "
+          "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 "
          "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.",
@@ -252,7 +255,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(
                    "res/conditions/mouse.png")
      .AddCodeOnlyParameter("currentScene", "")
      .AddParameter("mouse", _("Button to check"))
-      .MarkAsSimple();
+      .MarkAsSimple()
+      .SetHidden();

  // Support for deprecated names:
  extension.AddDuplicatedCondition("SourisBouton", "MouseButtonPressed")
@@ -262,49 +266,39 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(
      .AddCondition("MouseButtonReleased",
                    _("Mouse button released"),
                    _("Check if the specified mouse button was released."),
-                    _("_PARAM1_ mouse button was released"),
+                    _("Touch or _PARAM1_ mouse button is 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(
-          "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")
+      .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")
      .AddCodeOnlyParameter("currentScene", "")
-      .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();
+      .AddParameter("mouseButton", _("Button to check"))
+      .MarkAsSimple();

  extension
      .AddExpressionAndCondition("number",
--- a/Core/GDCore/Extensions/Builtin/NetworkExtension.cpp
+++ b/Core/GDCore/Extensions/Builtin/NetworkExtension.cpp
@@ -15,8 +15,9 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsNetworkExtension(
      .SetExtensionInformation(
          "BuiltinNetwork",
          _("Network"),
-          _("Features to send web requests, communicate with external \"APIs\" "
-            "and other network related tasks."),
+          _("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."),
          "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/Tools/Localization.h"
 #include "GDCore/Extensions/Metadata/MultipleInstructionMetadata.h"
+#include "GDCore/Tools/Localization.h"

 using namespace std;
 namespace gd {
@@ -16,7 +16,11 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSceneExtension(
      .SetExtensionInformation(
          "BuiltinScene",
          _("Scene"),
-          _("Actions and conditions to manipulate the scenes during the game."),
+          _("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."),
          "Florian Rival",
          "Open source (MIT License)")
      .SetExtensionHelpPath("" /*TODO: Add a documentation page for this */);
@@ -166,25 +170,28 @@ 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)."),
-                                _("_PARAM0_ 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)."),
+                                 _("_PARAM1_ loading progress"),
+                                 _(""),
+                                 "res/actions/hourglass_black.svg")
      .SetHelpPath("/all-features/resources-loading")
      .AddCodeOnlyParameter("currentScene", "")
      .AddParameter("sceneName", _("Scene name"))
@@ -192,13 +199,14 @@ 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,12 +15,13 @@ namespace gd {
 void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
    gd::PlatformExtension& extension) {
  extension
-      .SetExtensionInformation("Sprite",
-                               _("Sprite"),
-                               _("Sprite are animated object which can be used "
-                                 "for most elements of a game."),
-                               "Florian Rival",
-                               "Open source (MIT License)")
+      .SetExtensionInformation(
+          "Sprite",
+          _("Sprite"),
+          _("Sprite are animated objects which can be used "
+            "for most elements of a 2D game."),
+          "Florian Rival",
+          "Open source (MIT License)")
      .SetExtensionHelpPath("/objects/sprite");
  extension.AddInstructionOrExpressionGroupMetadata(_("Sprite"))
      .SetIcon("CppPlatform/Extensions/spriteicon.png");
@@ -30,7 +31,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
          .AddObject<SpriteObject>("Sprite",
                                   _("Sprite"),
                                   _("Animated object which can be used for "
-                                     "most elements of a game."),
+                                     "most elements of a 2D game."),
                                   "CppPlatform/Extensions/spriteicon.png")
          .SetCategoryFullName(_("General"))
          .SetOpenFullEditorLabel(_("Edit animations"))
@@ -645,11 +646,12 @@ 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,7 +16,8 @@ BuiltinExtensionsImplementer::ImplementsStringInstructionsExtension(
      .SetExtensionInformation(
          "BuiltinStringInstructions",
          _("Text manipulation"),
-          "Provides expressions to manipulate strings (also called texts).",
+          "Provides expressions to manipulate strings (also called texts): new "
+          "line, upper/lowercase, substring, find, replace, etc...",
          "Florian Rival",
          "Open source (MIT License)")
      .SetExtensionHelpPath("" /*TODO: Add a documentation page for this */);
@@ -191,7 +192,8 @@ 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",
@@ -199,10 +201,11 @@ 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,9 +15,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsTimeExtension(
      .SetExtensionInformation(
          "BuiltinTime",
          _("Timers and 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).",
+          "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.",
          "Florian Rival",
          "Open source (MIT License)")
      .SetExtensionHelpPath("/all-features/timers-and-time");
@@ -43,7 +46,9 @@ 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."),
+                      "condition doesn't start the timer and will always be "
+                      "false if the timer was not started previously (whatever "
+                      "the comparison being made)."),
                    _("The timer _PARAM1_ _PARAM2_ _PARAM3_ seconds"),

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

  extension
-      .AddExpression("TimeFromStart",
-                     _("Time elapsed since the beginning of the scene"),
-                     _("Time elapsed since the beginning of the scene"),
-                     "",
-                     "res/actions/time.png")
+      .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")
      .AddCodeOnlyParameter("currentScene", "");

  extension
-      .AddExpression("TempsDebut",
-                     _("Time elapsed since the beginning of the scene"),
-                     _("Time elapsed since the beginning of the scene"),
-                     "",
-                     "res/actions/time.png")
+      .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")
      .SetHidden()
      .AddCodeOnlyParameter("currentScene", "");

@@ -224,16 +231,21 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsTimeExtension(
  extension
      .AddExpression("Time",
                     _("Current time"),
-                     _("Current time"),
+                     _("Gives the current time"),
                     "",
                     "res/actions/time.png")
      .AddCodeOnlyParameter("currentScene", "")
      .AddParameter(
          "stringWithSelector",
-          _("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 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\", \"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("variable", _("Variable"))
+      .AddParameter("variableOrPropertyOrParameter", _("Variable"))
      .UseStandardRelationalOperatorParameters(
          "number", ParameterOptions::MakeNewOptions());

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

@@ -58,7 +58,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
          "",
          "res/conditions/var24.png",
          "res/conditions/var.png")
-      .AddParameter("variable", _("Variable"))
+      .AddParameter("variableOrPropertyOrParameter", _("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("variable", _("Variable"))
+      .AddParameter("variableOrProperty", _("Variable"))
      .UseStandardOperatorParameters("number",
                                     ParameterOptions::MakeNewOptions());

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

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

  extension
@@ -129,6 +130,7 @@ 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
@@ -142,6 +144,7 @@ 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
@@ -154,6 +157,7 @@ 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
@@ -170,12 +174,13 @@ 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 text variable"),
+          _("Add value to array variable"),
          _("Adds a text (string) at the end of a array variable."),
          _("Add the value _PARAM1_ to array variable _PARAM0_"),
          _("Arrays and structures"),
@@ -183,11 +188,12 @@ 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 variable array value"),
+                 _("Add value to array variable"),
                 _("Adds a number at the end of an array variable."),
                 _("Add the value _PARAM1_ to array variable _PARAM0_"),
                 _("Arrays and structures"),
@@ -195,11 +201,12 @@ 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 boolean variable"),
+                 _("Add value to array variable"),
                 _("Adds a boolean at the end of an array variable."),
                 _("Add the value _PARAM1_ to array variable _PARAM0_"),
                 _("Arrays and structures"),
@@ -207,6 +214,7 @@ 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
@@ -221,6 +229,7 @@ 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
@@ -231,7 +240,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
            "it is a text (string)."),
          _("Arrays and structures"),
          "res/actions/var.png")
-      .AddParameter("variable", _("Array variable"));
+      .AddParameter("variable", _("Array variable"))
+      .SetHelpPath("/all-features/variables/structures-and-arrays/");

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

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

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

  // Legacy instructions

@@ -270,26 +283,28 @@ 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();
+      .SetRelevantForFunctionEventsOnly()
+      .SetHidden();

  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();
+      .SetRelevantForFunctionEventsOnly()
+      .SetHidden();

  extension
      .AddCondition(
@@ -297,13 +312,14 @@ 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();
+      .SetRelevantForFunctionEventsOnly()
+      .SetHidden();

  extension
      .AddCondition("VariableChildExists",
@@ -311,12 +327,14 @@ 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
@@ -325,12 +343,14 @@ 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
@@ -338,7 +358,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", "")
@@ -350,13 +370,14 @@ 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
@@ -364,13 +385,14 @@ 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
@@ -379,20 +401,21 @@ 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();
+      .SetRelevantForFunctionEventsOnly()
+      .SetHidden();

  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", "")
@@ -405,26 +428,28 @@ 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();
+      .SetRelevantForFunctionEventsOnly()
+      .SetHidden();

  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();
+      .SetRelevantForFunctionEventsOnly()
+      .SetHidden();

  extension
      .AddAction(
@@ -432,12 +457,13 @@ 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();
+      .SetRelevantForFunctionEventsOnly()
+      .SetHidden();

  extension
      .AddAction("ToggleSceneVariableAsBoolean",
@@ -446,24 +472,26 @@ 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();
+      .SetRelevantForFunctionEventsOnly()
+      .SetHidden();

  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
@@ -471,13 +499,14 @@ 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
@@ -486,12 +515,13 @@ 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();
+      .SetRelevantForFunctionEventsOnly()
+      .SetHidden();

  extension
      .AddAction("ToggleGlobalVariableAsBoolean",
@@ -500,11 +530,12 @@ 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();
+      .SetRelevantForFunctionEventsOnly()
+      .SetHidden();

  extension
      .AddAction(
@@ -512,13 +543,15 @@ 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();
+      .SetRelevantForFunctionEventsOnly()
+      .SetHidden();

  extension
      .AddAction(
@@ -526,13 +559,15 @@ 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();
+      .SetRelevantForFunctionEventsOnly()
+      .SetHidden();

  extension
      .AddAction("VariableClearChildren",
@@ -540,11 +575,13 @@ 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
@@ -553,11 +590,13 @@ 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
@@ -566,7 +605,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"))
@@ -574,7 +613,9 @@ 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
@@ -583,12 +624,14 @@ 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
@@ -596,12 +639,14 @@ 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
@@ -609,12 +654,14 @@ 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
@@ -624,12 +671,14 @@ 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
@@ -638,13 +687,15 @@ 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
@@ -653,10 +704,12 @@ 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"))
-      .SetRelevantForFunctionEventsOnly();
+      .SetHelpPath("/all-features/variables/structures-and-arrays/")
+      .SetRelevantForFunctionEventsOnly()
+      .SetHidden();

  extension
      .AddExpression(
@@ -664,10 +717,12 @@ 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"))
-      .SetRelevantForFunctionEventsOnly();
+      .SetHelpPath("/all-features/variables/structures-and-arrays/")
+      .SetRelevantForFunctionEventsOnly()
+      .SetHidden();

  extension
      .AddStrExpression(
@@ -675,10 +730,12 @@ 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"))
-      .SetRelevantForFunctionEventsOnly();
+      .SetHelpPath("/all-features/variables/structures-and-arrays/")
+      .SetRelevantForFunctionEventsOnly()
+      .SetHidden();

  extension
      .AddExpression(
@@ -686,10 +743,12 @@ 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"))
-      .SetRelevantForFunctionEventsOnly();
+      .SetHelpPath("/all-features/variables/structures-and-arrays/")
+      .SetRelevantForFunctionEventsOnly()
+      .SetHidden();

  extension
      .AddAction(
@@ -697,7 +756,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"))
@@ -705,7 +764,9 @@ 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
@@ -715,12 +776,14 @@ 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
@@ -729,12 +792,14 @@ 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
@@ -742,12 +807,14 @@ 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
@@ -755,12 +822,14 @@ 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
@@ -769,13 +838,15 @@ 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
@@ -783,20 +854,24 @@ 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"))
-      .SetRelevantForFunctionEventsOnly();
+      .SetHelpPath("/all-features/variables/structures-and-arrays/")
+      .SetRelevantForFunctionEventsOnly()
+      .SetHidden();

  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"))
-      .SetRelevantForFunctionEventsOnly();
+      .SetHelpPath("/all-features/variables/structures-and-arrays/")
+      .SetRelevantForFunctionEventsOnly()
+      .SetHidden();

  extension
      .AddStrExpression(
@@ -804,10 +879,12 @@ 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"))
-      .SetRelevantForFunctionEventsOnly();
+      .SetHelpPath("/all-features/variables/structures-and-arrays/")
+      .SetRelevantForFunctionEventsOnly()
+      .SetHidden();

  extension
      .AddExpression(
@@ -815,20 +892,23 @@ 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();
+      .SetRelevantForFunctionEventsOnly()
+      .SetHidden();

  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"))
-      .SetRelevantForFunctionEventsOnly();
+      .SetHelpPath("/all-features/variables/structures-and-arrays/")
+      .SetRelevantForFunctionEventsOnly()
+      .SetHidden();

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

  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();
+      .SetRelevantForFunctionEventsOnly()
+      .SetHidden();

  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();
+      .SetRelevantForFunctionEventsOnly()
+      .SetHidden();

  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();
+      .SetRelevantForFunctionEventsOnly()
+      .SetHidden();

  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();
+      .SetRelevantForFunctionEventsOnly()
+      .SetHidden();
 }

 }  // namespace gd
--- a/Core/GDCore/Extensions/Builtin/WindowExtension.cpp
+++ b/Core/GDCore/Extensions/Builtin/WindowExtension.cpp
@@ -15,16 +15,17 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsWindowExtension(
      .SetExtensionInformation(
          "BuiltinWindow",
          _("Game window and resolution"),
-          "Provides actions and conditions to manipulate the game window. "
+          "Actions and conditions to manipulate the game window or change how "
+          "the game is resized according to the screen size. "
          "Depending on the platform on which the game is running, not all of "
-          "these features can be applied.",
+          "these features can be applied.\n"
+          "Also contains expressions to read the screen size.",
          "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
@@ -272,7 +272,7 @@ class GD_CORE_API BehaviorMetadata : public InstructionOrExpressionContainerMeta
   * Check if the behavior is private - it can't be used outside of its
   * extension.
   */
-  bool IsPrivate() const { return isPrivate; }
+  bool IsPrivate() const override { return isPrivate; }

  /**
   * Set that the behavior is private - it can't be used outside of its
@@ -298,6 +298,19 @@ 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;
  }
@@ -393,6 +406,7 @@ 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/InstructionOrExpressionContainerMetadata.h
+++ b/Core/GDCore/Extensions/Metadata/InstructionOrExpressionContainerMetadata.h
@@ -174,6 +174,7 @@ public:
  virtual const gd::String &GetFullName() const = 0;
  virtual const gd::String &GetDescription() const = 0;
  virtual const gd::String &GetIconFilename() const = 0;
+  virtual bool IsPrivate() const = 0;

  /**
   * \brief Return a reference to a map containing the names of the actions
--- a/Core/GDCore/Extensions/Metadata/MetadataProvider.h
+++ b/Core/GDCore/Extensions/Metadata/MetadataProvider.h
@@ -277,6 +277,10 @@ 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,30 +46,25 @@ ObjectMetadata::ObjectMetadata(const gd::String& extensionNamespace_,
                               const gd::String& fullname_,
                               const gd::String& description_,
                               const gd::String& icon24x24)
-    : 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;
-    }) {}
+    : name(name_),
+      iconFilename(icon24x24),
+      extensionNamespace(extensionNamespace_) {
+  SetFullName(gd::String(fullname_));
+  SetDescription(gd::String(description_));
+}

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

 gd::InstructionMetadata& ObjectMetadata::AddCondition(
--- a/Core/GDCore/Extensions/Metadata/ObjectMetadata.h
+++ b/Core/GDCore/Extensions/Metadata/ObjectMetadata.h
@@ -39,6 +39,8 @@ 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_,
@@ -47,9 +49,9 @@ class GD_CORE_API ObjectMetadata : public InstructionOrExpressionContainerMetada
                 const gd::String& icon24x24_,
                 std::shared_ptr<gd::ObjectConfiguration> blueprintObject_);
  /**
-   * \brief Construct an object metadata, without "blueprint" object
+   * \brief Construct an object metadata.
   *
-   * \note This is used by events based objects.
+   * \note This is used by events based objects ("custom objects").
   */
  ObjectMetadata(const gd::String& extensionNamespace_,
                 const gd::String& name_,
@@ -60,14 +62,17 @@ 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 createFunPtrP);
-  ObjectMetadata() : createFunPtr(NULL) {}
+                 CreateFunPtr createFunPtr_);
+
+  ObjectMetadata() {}
  virtual ~ObjectMetadata(){};

  /**
@@ -300,6 +305,22 @@ class GD_CORE_API ObjectMetadata : public InstructionOrExpressionContainerMetada
   */
  std::map<gd::String, gd::ExpressionMetadata>& GetAllStrExpressions() override { return strExpressionsInfos; };

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

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

 private:
  gd::String extensionNamespace;
@@ -356,6 +377,7 @@ class GD_CORE_API ObjectMetadata : public InstructionOrExpressionContainerMetada
  gd::String iconFilename;
  gd::String categoryFullName;
  std::set<gd::String> defaultBehaviorTypes;
+  bool isPrivate = false;
  bool hidden = false;
  bool isRenderedIn3D = false;
  gd::String openFullEditorLabel;
--- a/Core/GDCore/Extensions/Metadata/ParameterMetadataTools.cpp
+++ b/Core/GDCore/Extensions/Metadata/ParameterMetadataTools.cpp
@@ -33,7 +33,8 @@ void ParameterMetadataTools::ParametersToObjectsContainer(
    const auto& parameter = parameters.GetParameter(i);
    if (parameter.GetName().empty()) continue;

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

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

    // 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,7 +64,8 @@ class GD_CORE_API ParameterMetadataTools {
      std::function<void(const gd::ParameterMetadata& parameterMetadata,
                         const gd::Expression& parameterValue,
                         size_t parameterIndex,
-                         const gd::String& lastObjectName)> fn);
+                         const gd::String& lastObjectName,
+                         size_t lastObjectIndex)> fn);

  /**
   * Iterate over the parameters of a FunctionCallNode.
--- a/Core/GDCore/Extensions/Metadata/SourceFileMetadata.h
+++ b/Core/GDCore/Extensions/Metadata/SourceFileMetadata.h
@@ -0,0 +1,56 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#pragma once
+#include "GDCore/String.h"
+#include "GDCore/Serialization/SerializerElement.h"
+
+namespace gd {
+/**
+ * \brief Contains information about a source file that must be included
+ * when an extension is used.
+ */
+class GD_CORE_API SourceFileMetadata {
+ public:
+  /**
+   * Construct a new dependency metadata, though you probably want to call
+   * `AddSourceFile` on gd::PlatformExtension.
+   *
+   * \see gd::PlatformExtension
+   */
+  SourceFileMetadata() {};
+
+  SourceFileMetadata& SetResourceName(const gd::String& resourceName_) {
+    resourceName = resourceName_;
+    return *this;
+  };
+
+  SourceFileMetadata& SetIncludePosition(const gd::String& includePosition_) {
+    includePosition = includePosition_;
+    return *this;
+  };
+
+  const gd::String& GetResourceName() const { return resourceName; };
+
+  gd::String& GetResourceName() { return resourceName; };
+
+  const gd::String& GetIncludePosition() const { return includePosition; };
+
+  void SerializeTo(SerializerElement& element) const {
+    element.AddChild("resourceName").SetStringValue(resourceName);
+    element.AddChild("includePosition").SetStringValue(includePosition);
+  }
+
+  void UnserializeFrom(const SerializerElement& element) {
+    resourceName = element.GetStringAttribute("resourceName");
+    includePosition = element.GetStringAttribute("includePosition", "last");
+  }
+
+ private:
+  gd::String resourceName;  ///< The name of the resource in the project.
+  gd::String includePosition = "last";  ///< "first" or "last".
+};
+
+}  // namespace gd
--- a/Core/GDCore/Extensions/Metadata/ValueTypeMetadata.cpp
+++ b/Core/GDCore/Extensions/Metadata/ValueTypeMetadata.cpp
@@ -79,6 +79,8 @@ 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) {
@@ -94,8 +96,12 @@ 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" or default
+  // For "String", "Resource", "MultilineString" 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 number.
+   * \brief Return true if the type of the parameter is a variable.
   * \note If you had a new type of parameter, also add it in the IDE (
   * see EventsFunctionParametersEditor, ParameterRenderingService
   * and ExpressionAutocompletion) and in the EventsCodeGenerator.
@@ -148,6 +148,19 @@ 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"
@@ -212,15 +225,20 @@ 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
-             parameterType == "variable" || // Any variable.
-             // Old, "pre-scoped" variables:
-             parameterType == "objectvar" || parameterType == "globalvar" ||
-             parameterType == "scenevar";
+          // Any variable.
+          parameterType == "variable" ||
+          parameterType == "variableOrProperty" ||
+          parameterType == "variableOrPropertyOrParameter" ||
+          // Old, "pre-scoped" variables:
+          parameterType == "objectvar" || parameterType == "globalvar" ||
+          parameterType == "scenevar";
    } else if (type == "resource") {
      return parameterType == "fontResource" ||
             parameterType == "audioResource" ||
@@ -316,6 +334,8 @@ 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,12 +38,14 @@ bool Platform::AddExtension(std::shared_ptr<gd::PlatformExtension> extension) {

  extensionsLoaded.push_back(extension);

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

  for (const auto& it :
@@ -62,7 +64,9 @@ 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) {
-        creationFunctionTable.erase(objectsTypes[i]);
+        if (creationFunctionTable.find(objectsTypes[i]) != creationFunctionTable.end()) {
+          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/ObjectConfiguration.h"
 #include "GDCore/Project/BehaviorsSharedData.h"
+#include "GDCore/Project/ObjectConfiguration.h"
 #include "GDCore/Tools/Localization.h"

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

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

+gd::SourceFileMetadata& PlatformExtension::AddSourceFile() {
+  extensionSourceFilesMetadata.push_back(SourceFileMetadata());
+  return extensionSourceFilesMetadata.back();
+}
+
 gd::ObjectMetadata& PlatformExtension::AddObject(
    const gd::String& name,
    const gd::String& fullname,
@@ -239,12 +244,10 @@ 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];
 }

@@ -348,8 +351,7 @@ 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();
 }

@@ -381,7 +383,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;
  }
@@ -401,7 +403,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;
  }
@@ -418,7 +420,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;
  }
@@ -435,7 +437,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;
  }
@@ -463,10 +465,24 @@ PlatformExtension::GetAllStrExpressions() {
  return strExpressionsInfos;
 }

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

+const std::vector<gd::SourceFileMetadata>&
+PlatformExtension::GetAllSourceFiles() const {
+  return extensionSourceFilesMetadata;
+}
+
+std::vector<gd::SourceFileMetadata>& PlatformExtension::GetAllSourceFiles() {
+  return extensionSourceFilesMetadata;
+}
+
 std::map<gd::String, gd::EventMetadata>& PlatformExtension::GetAllEvents() {
  return eventsInfos;
 }
@@ -598,37 +614,6 @@ 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();
@@ -774,41 +759,28 @@ 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::GetObjectEventsFunctionFullType(
-    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();
-  return extensionName + separator + objectName;
-}
-
-gd::String PlatformExtension::GetExtensionFromFullObjectType(const gd::String& type) {
+gd::String PlatformExtension::GetExtensionFromFullBehaviorType(
+    const gd::String& type) {
  const auto separatorIndex =
      type.find(PlatformExtension::GetNamespaceSeparator());
  if (separatorIndex == std::string::npos) {
@@ -817,7 +789,49 @@ gd::String PlatformExtension::GetExtensionFromFullObjectType(const gd::String& t
  return type.substr(0, separatorIndex);
 }

-gd::String PlatformExtension::GetObjectNameFromFullObjectType(const gd::String& type) {
+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();
+  return extensionName + separator + objectName + separator + functionName;
+}
+
+gd::String PlatformExtension::GetObjectFullType(const gd::String& extensionName,
+                                                const gd::String& objectName) {
+  const auto& separator = GetNamespaceSeparator();
+  return extensionName + separator + objectName;
+}
+
+gd::String PlatformExtension::GetVariantFullType(const gd::String& extensionName,
+                                                const gd::String& objectName,
+                                                const gd::String& variantName) {
+  const auto& separator = GetNamespaceSeparator();
+  return extensionName + separator + objectName + separator + variantName;
+}
+
+gd::String PlatformExtension::GetExtensionFromFullObjectType(
+    const gd::String& type) {
+  const auto separatorIndex =
+      type.find(PlatformExtension::GetNamespaceSeparator());
+  if (separatorIndex == std::string::npos) {
+    return "";
+  }
+  return type.substr(0, separatorIndex);
+}
+
+gd::String PlatformExtension::GetObjectNameFromFullObjectType(
+    const gd::String& type) {
  const auto separatorIndex =
      type.find(PlatformExtension::GetNamespaceSeparator());
  if (separatorIndex == std::string::npos) {
--- a/Core/GDCore/Extensions/PlatformExtension.h
+++ b/Core/GDCore/Extensions/PlatformExtension.h
@@ -17,6 +17,7 @@
 #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"
@@ -214,6 +215,7 @@ class GD_CORE_API PlatformExtension {
      const gd::String& icon);

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

  /**
   * \brief Declare a new object as being part of the extension.
@@ -438,12 +440,6 @@ 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
@@ -552,6 +548,24 @@ class GD_CORE_API PlatformExtension {
   */
  std::vector<gd::DependencyMetadata>& GetAllDependencies();

+  /**
+   * \brief Return a reference to a vector containing the metadata of all the
+   * dependencies of the extension.
+   */
+  const std::vector<gd::DependencyMetadata>& GetAllDependencies() const;
+
+  /**
+   * \brief Return a reference to a vector containing the metadata of all the
+   * dependencies of the extension.
+   */
+  std::vector<gd::SourceFileMetadata>& GetAllSourceFiles();
+
+  /**
+   * \brief Return a reference to a vector containing the metadata of all the
+   * dependencies of the extension.
+   */
+  const std::vector<gd::SourceFileMetadata>& GetAllSourceFiles() const;
+
  /**
   * \brief Return a reference to a map containing the names of the actions,
   * related to the object type, and the metadata associated with.
@@ -620,12 +634,6 @@ 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.
@@ -643,6 +651,10 @@ 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,
@@ -651,6 +663,10 @@ class GD_CORE_API PlatformExtension {
  static gd::String GetObjectFullType(const gd::String& extensionName,
                                      const gd::String& objectName);

+static gd::String GetVariantFullType(const gd::String& extensionName,
+                                                const gd::String& objectName,
+                                                const gd::String& variantName);
+
  static gd::String GetExtensionFromFullObjectType(const gd::String& type);

  static gd::String GetObjectNameFromFullObjectType(const gd::String& type);
@@ -687,6 +703,7 @@ class GD_CORE_API PlatformExtension {
  std::map<gd::String, gd::ExpressionMetadata> expressionsInfos;
  std::map<gd::String, gd::ExpressionMetadata> strExpressionsInfos;
  std::vector<gd::DependencyMetadata> extensionDependenciesMetadata;
+  std::vector<gd::SourceFileMetadata> extensionSourceFilesMetadata;
  std::map<gd::String, gd::EventMetadata> eventsInfos;
  std::map<gd::String, gd::PropertyDescriptor> extensionPropertiesMetadata;
  std::map<gd::String, InstructionOrExpressionGroupMetadata>
--- a/Core/GDCore/IDE/DependenciesAnalyzer.cpp
+++ b/Core/GDCore/IDE/DependenciesAnalyzer.cpp
@@ -12,7 +12,6 @@
 #include "GDCore/Project/ExternalEvents.h"
 #include "GDCore/Project/Layout.h"
 #include "GDCore/Project/Project.h"
-#include "GDCore/Project/SourceFile.h"

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

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

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

  std::set<gd::String> scenesDependencies;
  std::set<gd::String> externalEventsDependencies;
-  std::set<gd::String> sourceFilesDependencies;
  std::vector<gd::String>
      parentScenes;  ///< Used to check for circular dependencies.
  std::vector<gd::String>
--- a/Core/GDCore/IDE/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) {
+          const gd::String &lastObjectName, size_t lastObjectIndex) {
        if (parameterMetadata.GetValueTypeMetadata().IsBehavior() &&
            parameterValue.GetPlainString().length() == 0) {

--- a/Core/GDCore/IDE/Events/EventsBehaviorRenamer.cpp
+++ b/Core/GDCore/IDE/Events/EventsBehaviorRenamer.cpp
@@ -108,12 +108,10 @@ 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) {
+      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& 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.IsVariable();
+        isParentTypeAVariable = parameterTypeMetadata.IsVariableOnly();
        parameter->Visit(*this);
      }
    }
@@ -183,12 +183,10 @@ 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) {
+      instruction.GetParameters(), metadata.GetParameters(),
+      [&](const gd::ParameterMetadata &parameterMetadata,
+          const gd::Expression &parameterValue, size_t parameterIndex,
+          const gd::String &lastObjectName, size_t lastObjectIndex) {
        if (!gd::EventsParameterReplacer::CanContainParameter(
          parameterMetadata.GetValueTypeMetadata())) {
          return;
@@ -197,7 +195,7 @@ bool EventsParameterReplacer::DoVisitInstruction(gd::Instruction& instruction,
        if (node) {
          ExpressionParameterReplacer renamer(
              platform, GetProjectScopedContainers(),
-              parameterMetadata.GetValueTypeMetadata().IsVariable(),
+              parameterMetadata.GetValueTypeMetadata().IsVariableOnly(),
              oldToNewPropertyNames);
          node->Visit(renamer);

@@ -221,7 +219,7 @@ bool EventsParameterReplacer::DoVisitEventExpression(
  if (node) {
    ExpressionParameterReplacer renamer(
        platform, GetProjectScopedContainers(),
-        metadata.GetValueTypeMetadata().IsVariable(), oldToNewPropertyNames);
+        metadata.GetValueTypeMetadata().IsVariableOnly(), 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.IsVariable();
+        isParentTypeAVariable = parameterTypeMetadata.IsVariableOnly();
        parameter->Visit(*this);
      }
    }
@@ -217,12 +217,10 @@ 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) {
+      instruction.GetParameters(), metadata.GetParameters(),
+      [&](const gd::ParameterMetadata &parameterMetadata,
+          const gd::Expression &parameterValue, size_t parameterIndex,
+          const gd::String &lastObjectName, size_t lastObjectIndex) {
        if (!gd::EventsPropertyReplacer::CanContainProperty(
          parameterMetadata.GetValueTypeMetadata())) {
          return;
@@ -231,7 +229,7 @@ bool EventsPropertyReplacer::DoVisitInstruction(gd::Instruction& instruction,
        if (node) {
          ExpressionPropertyReplacer renamer(
              platform, GetProjectScopedContainers(), targetPropertiesContainer,
-              parameterMetadata.GetValueTypeMetadata().IsVariable(),
+              parameterMetadata.GetValueTypeMetadata().IsVariableOnly(),
              oldToNewPropertyNames, removedPropertyNames);
          node->Visit(renamer);

@@ -257,7 +255,7 @@ bool EventsPropertyReplacer::DoVisitEventExpression(
  if (node) {
    ExpressionPropertyReplacer renamer(
        platform, GetProjectScopedContainers(), targetPropertiesContainer,
-        metadata.GetValueTypeMetadata().IsVariable(), oldToNewPropertyNames,
+        metadata.GetValueTypeMetadata().IsVariableOnly(), 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) {
+            const gd::String &lastObjectName, size_t lastObjectIndex) {
          if (!gd::EventsObjectReplacer::CanContainObject(
                  parameterMetadata.GetValueTypeMetadata())) {
            return;
--- a/Core/GDCore/IDE/Events/EventsVariableInstructionTypeSwitcher.cpp
+++ b/Core/GDCore/IDE/Events/EventsVariableInstructionTypeSwitcher.cpp
@@ -42,18 +42,16 @@ 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) {
+      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& type = parameterMetadata.GetType();

        if (!gd::ParameterMetadata::IsExpression("variable", type) ||
            !gd::VariableInstructionSwitcher::IsSwitchableVariableInstruction(
                instruction.GetType())) {
-                  return;
+          return;
        }
        const auto variableName =
            gd::ExpressionVariableNameFinder::GetVariableName(
@@ -71,13 +69,19 @@ 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()
-                      .GetVariablesContainerFromVariableName(variableName);
+                      .GetVariablesContainerFromVariableOrPropertyOrParameterName(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()
-                   .GetVariablesContainerFromVariableName(node.name) ==
+                   .GetVariablesContainerFromVariableOrPropertyOrParameterName(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()
-                   .GetVariablesContainerFromVariableName(
+                   .GetVariablesContainerFromVariableOrPropertyOrParameterName(
                       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,12 +448,10 @@ 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) {
+      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& type = parameterMetadata.GetType();

        if (!gd::ParameterMetadata::IsExpression("variable", type) &&
--- a/Core/GDCore/IDE/Events/EventsVariableReplacer.h
+++ b/Core/GDCore/IDE/Events/EventsVariableReplacer.h
@@ -73,6 +73,7 @@ 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
@@ -0,0 +1,235 @@
+#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
@@ -0,0 +1,77 @@
+/*
+ * 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()
-                  .GetVariablesContainerFromVariableName(variableName)
+                  .GetVariablesContainerFromVariableOrPropertyOrParameterName(variableName)
                  .GetSourceType());
          completions.push_back(description);

@@ -1086,7 +1086,7 @@ class GD_CORE_API ExpressionCompletionFinder
          description.SetVariableType(variable.GetType());
          description.SetVariableScope(
              projectScopedContainers.GetVariablesContainersList()
-                  .GetVariablesContainerFromVariableName(variableName)
+                  .GetVariablesContainerFromVariableOrPropertyOrParameterName(variableName)
                  .GetSourceType());
          completions.push_back(description);

--- a/Core/GDCore/IDE/Events/ExpressionValidator.cpp
+++ b/Core/GDCore/IDE/Events/ExpressionValidator.cpp
@@ -460,10 +460,12 @@ const gd::String& ExpressionValidator::TypeToString(Type type) {
    case Type::NumberOrString:
      return numberOrStringTypeString;
    case Type::Variable:
-      return variableTypeString;
+      // 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:
    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;
@@ -493,8 +495,11 @@ ExpressionValidator::Type ExpressionValidator::StringToType(
          ExpressionValidator::variableTypeString, type)) {
    if (gd::ValueTypeMetadata::IsTypeLegacyPreScopedVariable(type)) {
      return Type::LegacyVariable;
-    }
-    else {
+    } else if (type == "variableOrProperty") {
+      return Type::VariableOrProperty;
+    } else if (type == "variableOrPropertyOrParameter") {
+      return Type::VariableOrPropertyOrParameter;
+    } else {
      return Type::Variable;
    }
  }
--- a/Core/GDCore/IDE/Events/ExpressionValidator.h
+++ b/Core/GDCore/IDE/Events/ExpressionValidator.h
@@ -203,10 +203,12 @@ class GD_CORE_API ExpressionValidator : public ExpressionParser2NodeWorker {
  void OnVisitVariableNode(VariableNode& node) override {
    ReportAnyError(node);

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

-      CheckVariableExistence(node.location, node.name);
+      CheckVariableExistence(node.location, node.name, node.child != nullptr);
      if (node.child) {
        node.child->Visit(*this);
      }
@@ -216,7 +218,8 @@ 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;

@@ -336,11 +339,12 @@ 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) {
-      CheckVariableExistence(node.location, node.identifierName);
-    }
-    else if (parentType != Type::Object && parentType != Type::LegacyVariable) {
+    } 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) {
      // It can't happen.
      RaiseTypeError(
          _("You've entered a name, but this type was expected:") + " " + TypeToString(parentType),
@@ -376,8 +380,19 @@ class GD_CORE_API ExpressionValidator : public ExpressionParser2NodeWorker {
    childType = Type::Empty;
  }

- private:
-  enum Type {Unknown = 0, Number, String, NumberOrString, Variable, LegacyVariable, Object, Empty};
+private:
+  enum Type {
+    Unknown = 0,
+    Number,
+    String,
+    NumberOrString,
+    Variable,
+    LegacyVariable,
+    Object,
+    Empty,
+    VariableOrProperty,
+    VariableOrPropertyOrParameter
+  };
  Type ValidateFunction(const gd::FunctionCallNode& function);
  bool ValidateObjectVariableOrVariableOrProperty(const gd::IdentifierNode& identifier);
  bool ValidateObjectVariableOrVariableOrProperty(
@@ -386,8 +401,10 @@ class GD_CORE_API ExpressionValidator : public ExpressionParser2NodeWorker {
      const gd::String &childIdentifierName,
      const gd::ExpressionParserLocation childIdentifierNameLocation);

-  void CheckVariableExistence(const ExpressionParserLocation &location, const gd::String& name) {
-    if (!currentParameterExtraInfo || *currentParameterExtraInfo != "AllowUndeclaredVariable") {
+  void CheckVariableExistence(const ExpressionParserLocation &location,
+                              const gd::String &name, bool hasChild) {
+    if (!currentParameterExtraInfo ||
+        *currentParameterExtraInfo != "AllowUndeclaredVariable") {
      projectScopedContainers.MatchIdentifierWithName<void>(
          name,
          [&]() {
@@ -402,19 +419,28 @@ class GD_CORE_API ExpressionValidator : public ExpressionParser2NodeWorker {
          },
          [&]() {
            // This is a property.
-            // 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);
+            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 is a parameter.
-            // 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);
+            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 is something else.
@@ -476,6 +502,13 @@ class GD_CORE_API ExpressionValidator : public ExpressionParser2NodeWorker {
               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()
-                        .GetVariablesContainerFromVariableName(identifier));
+                        .GetVariablesContainerFromVariableOrPropertyOrParameterName(identifier));
              variableName = identifier;
              if (childIdentifier) {
                childVariableNames.push_back(*childIdentifier);
@@ -223,12 +223,28 @@ class GD_CORE_API ExpressionVariablePathFinder
            }
          },
          [&]() {
-            // Ignore properties here.
-            // There is no support for "children" of properties.
+            // 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 parameters here.
-            // There is no support for "children" of parameters.
+            // 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 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) {
+          const gd::String &lastObjectName, size_t lastObjectIndex) {
        if (parameterMetadata.GetType() == "layer") {
          if (parameterValue.GetPlainString().length() < 2) {
            // This is either the base layer or an invalid layer name.
--- a/Core/GDCore/IDE/Events/UsedExtensionsFinder.cpp
+++ b/Core/GDCore/IDE/Events/UsedExtensionsFinder.cpp
@@ -13,6 +13,18 @@

 namespace gd {

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

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

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

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

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

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

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

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

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

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

--- a/Core/GDCore/IDE/Events/UsedExtensionsFinder.h
+++ b/Core/GDCore/IDE/Events/UsedExtensionsFinder.h
@@ -9,6 +9,8 @@
 #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"
@@ -44,6 +46,10 @@ public:
    return usedRequiredFiles;
  }

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

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

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

--- a/Core/GDCore/IDE/Events/UsedObjectTypeFinder.cpp
+++ b/Core/GDCore/IDE/Events/UsedObjectTypeFinder.cpp
@@ -0,0 +1,23 @@
+#include "UsedObjectTypeFinder.h"
+
+#include "GDCore/Events/Instruction.h"
+#include "GDCore/IDE/ProjectBrowserHelper.h"
+#include "GDCore/Project/Object.h"
+#include "GDCore/Project/Project.h"
+
+namespace gd {
+
+bool UsedObjectTypeFinder::ScanProject(gd::Project &project,
+                                       const gd::String &objectType) {
+  UsedObjectTypeFinder worker(project, objectType);
+  gd::ProjectBrowserHelper::ExposeProjectObjects(project, worker);
+  return worker.hasFoundObjectType;
+};
+
+void UsedObjectTypeFinder::DoVisitObject(gd::Object &object) {
+  if (!hasFoundObjectType && object.GetType() == objectType) {
+    hasFoundObjectType = true;
+  }
+};
+
+} // namespace gd
--- a/Core/GDCore/IDE/Events/UsedObjectTypeFinder.h
+++ b/Core/GDCore/IDE/Events/UsedObjectTypeFinder.h
@@ -0,0 +1,39 @@
+/*
+ * 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;
+} // namespace gd
+
+namespace gd {
+
+class GD_CORE_API UsedObjectTypeFinder : public ArbitraryObjectsWorker {
+public:
+  static bool ScanProject(gd::Project &project, const gd::String &objectType);
+
+private:
+  UsedObjectTypeFinder(gd::Project &project_, const gd::String &objectType_)
+      : project(project_), objectType(objectType_){};
+  gd::Project &project;
+  const gd::String &objectType;
+  bool hasFoundObjectType = false;
+
+  // Object Visitor
+  void DoVisitObject(gd::Object &object) override;
+};
+
+}; // namespace gd
--- a/Core/GDCore/IDE/EventsBasedObjectVariantHelper.cpp
+++ b/Core/GDCore/IDE/EventsBasedObjectVariantHelper.cpp
@@ -0,0 +1,154 @@
+/*
+ * 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
@@ -0,0 +1,26 @@
+/*
+ * 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,7 +9,10 @@
 #include "GDCore/Extensions/Metadata/ParameterMetadataTools.h"
 #include "GDCore/Project/EventsBasedBehavior.h"
 #include "GDCore/Project/EventsBasedObject.h"
-//#include "GDCore/Project/ObjectsContainer.h"
+#include "GDCore/Project/ObjectsContainer.h"
+#include "GDCore/Project/ParameterMetadataContainer.h"
+#include "GDCore/Project/PropertiesContainer.h"
+#include "GDCore/Project/VariablesContainer.h"
 #include "GDCore/Project/EventsFunction.h"
 #include "GDCore/Project/Object.h"
 #include "GDCore/Project/Project.h"
@@ -100,4 +103,72 @@ 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,6 +12,9 @@ namespace gd {
 class Project;
 class EventsFunctionsContainer;
 class ObjectsContainer;
+class ParameterMetadataContainer;
+class PropertiesContainer;
+class VariablesContainer;
 class ParameterMetadata;
 class EventsFunction;
 class EventsBasedBehavior;
@@ -68,5 +71,13 @@ 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/ObjectAssetSerializer.cpp
+++ b/Core/GDCore/IDE/ObjectAssetSerializer.cpp
@@ -17,6 +17,8 @@
 #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"
@@ -60,9 +62,6 @@ 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");
@@ -75,6 +74,28 @@ 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");
@@ -93,14 +114,24 @@ 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");
-  if (project.HasEventsFunctionsExtensionNamed(extensionName)) {
-    SerializerElement &requiredExtensionElement =
-        requiredExtensionsElement.AddChild("requiredExtension");
-    requiredExtensionElement.SetAttribute("extensionName", extensionName);
-    requiredExtensionElement.SetAttribute("extensionVersion", "1.0.0");
+  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());
+    }
  }

  // TODO This can be removed when the asset script no longer require it.
@@ -108,4 +139,59 @@ 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,6 +6,7 @@
 #pragma once
 #include <map>
 #include <vector>
+#include <unordered_set>

 #include "GDCore/String.h"

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

 namespace gd {
@@ -52,6 +54,13 @@ 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/ObjectVariableHelper.cpp
+++ b/Core/GDCore/IDE/ObjectVariableHelper.cpp
@@ -3,9 +3,11 @@
 * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
 * reserved. This project is released under the MIT License.
 */
-#include "GroupVariableHelper.h"
+#include "ObjectVariableHelper.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"
@@ -16,7 +18,7 @@

 namespace gd {

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

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

-void GroupVariableHelper::FillMissingGroupVariablesToObjects(
+void ObjectVariableHelper::FillMissingGroupVariablesToObjects(
    gd::ObjectsContainer &globalObjectsContainer,
    gd::ObjectsContainer &objectsContainer, const gd::ObjectGroup &objectGroup,
    const gd::SerializerElement &originalSerializedVariables) {
@@ -145,7 +147,7 @@ void GroupVariableHelper::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 GroupVariableHelper::ApplyChangesToObjects(
+void ObjectVariableHelper::ApplyChangesToObjects(
    gd::ObjectsContainer &globalObjectsContainer,
    gd::ObjectsContainer &objectsContainer,
    const gd::VariablesContainer &groupVariablesContainer,
@@ -172,6 +174,7 @@ void GroupVariableHelper::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;
@@ -193,4 +196,109 @@ void GroupVariableHelper::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,6 +8,8 @@
 #include "GDCore/Project/VariablesContainer.h"

 namespace gd {
+class EventsBasedObject;
+class InitialInstancesContainer;
 class ObjectsContainersList;
 class ObjectsContainer;
 class ObjectGroup;
@@ -22,7 +24,7 @@ namespace gd {
 *
 * This is used by the object group variable editor.
 */
-class GD_CORE_API GroupVariableHelper {
+class GD_CORE_API ObjectVariableHelper {
 public:
  /**
   * Copy every variable from every object of the group to the other objects
@@ -52,7 +54,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::GroupVariableHelper::MergeVariableContainers
+   * \see gd::ObjectVariableHelper::MergeVariableContainers
   */
  static void FillMissingGroupVariablesToObjects(
      gd::ObjectsContainer &globalObjectsContainer,
@@ -70,6 +72,22 @@ 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/Project/ArbitraryResourceWorker.cpp
+++ b/Core/GDCore/IDE/Project/ArbitraryResourceWorker.cpp
@@ -62,6 +62,11 @@ void ArbitraryResourceWorker::ExposeSpine(gd::String& resourceName){
    // do.
 };

+void ArbitraryResourceWorker::ExposeJavaScript(gd::String& resourceName){
+    // Nothing to do by default - each child class can define here the action to
+    // do.
+};
+
 void ArbitraryResourceWorker::ExposeVideo(gd::String& videoName){
    // Nothing to do by default - each child class can define here the action to
    // do.
@@ -195,6 +200,10 @@ void ArbitraryResourceWorker::ExposeResourceWithType(
    ExposeSpine(resourceName);
    return;
  }
+  if (resourceType == "javascript") {
+    ExposeJavaScript(resourceName);
+    return;
+  }
  gd::LogError("Unexpected resource type: " + resourceType + " for: " + resourceName);
  return;
 }
@@ -218,12 +227,11 @@ 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) {
+      instruction.GetParameters(), metadata.GetParameters(),
+      [this, &instruction](
+          const gd::ParameterMetadata &parameterMetadata,
+          const gd::Expression &parameterExpression, size_t parameterIndex,
+          const gd::String &lastObjectName, size_t lastObjectIndex) {
        const String& parameterValue = parameterExpression.GetPlainString();
        if (parameterMetadata.GetType() == "fontResource") {
          gd::String updatedParameterValue = parameterValue;
--- a/Core/GDCore/IDE/Project/ArbitraryResourceWorker.h
+++ b/Core/GDCore/IDE/Project/ArbitraryResourceWorker.h
@@ -96,7 +96,7 @@ public:
   * \brief Expose a 3D model, which is always a reference to a "model3D" resource.
   */
  virtual void ExposeModel3D(gd::String &resourceName);
-  
+
  /**
   * \brief Expose an atlas, which is always a reference to a "atlas" resource.
   */
@@ -112,6 +112,11 @@ public:
   */
  virtual void ExposeVideo(gd::String &videoName);

+  /**
+   * \brief Expose a JavaScript file, which is always a reference to a "javascript" resource.
+   */
+  virtual void ExposeJavaScript(gd::String &javaScriptName);
+
  /**
   * \brief Expose a bitmap font, which is always a reference to a "bitmapFont" resource.
   */
--- a/Core/GDCore/IDE/Project/AssetResourcePathCleaner.cpp
+++ b/Core/GDCore/IDE/Project/AssetResourcePathCleaner.cpp
@@ -38,6 +38,10 @@ void AssetResourcePathCleaner::ExposeVideo(gd::String &videoName) {
  ExposeResourceAsFile(videoName);
 }

+void AssetResourcePathCleaner::ExposeJavaScript(gd::String &javaScriptResourceName) {
+  ExposeResourceAsFile(javaScriptResourceName);
+}
+
 void AssetResourcePathCleaner::ExposeBitmapFont(gd::String &bitmapFontName) {
  ExposeResourceAsFile(bitmapFontName);
 }
--- a/Core/GDCore/IDE/Project/AssetResourcePathCleaner.h
+++ b/Core/GDCore/IDE/Project/AssetResourcePathCleaner.h
@@ -46,6 +46,7 @@ public:
  void ExposeTileset(gd::String &tilesetName) override;
  void ExposeVideo(gd::String &videoName) override;
  void ExposeBitmapFont(gd::String &bitmapFontName) override;
+  void ExposeJavaScript(gd::String &javaScriptResourceName) override;
  void ExposeFile(gd::String &resource) override;

 protected:
--- a/Core/GDCore/IDE/Project/ObjectsUsingResourceCollector.h
+++ b/Core/GDCore/IDE/Project/ObjectsUsingResourceCollector.h
@@ -73,6 +73,9 @@ public:
  virtual void ExposeVideo(gd::String& otherResourceName) override {
    MatchResourceName(otherResourceName);
  };
+  virtual void ExposeJavaScript(gd::String& otherResourceName) override {
+    MatchResourceName(otherResourceName);
+  };
  virtual void ExposeBitmapFont(gd::String& otherResourceName) override {
    MatchResourceName(otherResourceName);
  };
--- a/Core/GDCore/IDE/Project/ProjectResourcesCopier.cpp
+++ b/Core/GDCore/IDE/Project/ProjectResourcesCopier.cpp
@@ -7,7 +7,6 @@
 #include <map>
 #include "GDCore/CommonTools.h"
 #include "GDCore/IDE/AbstractFileSystem.h"
-#include "GDCore/IDE/Project/ResourcesAbsolutePathChecker.h"
 #include "GDCore/IDE/Project/ResourcesMergingHelper.h"
 #include "GDCore/Project/Project.h"
 #include "GDCore/Tools/Localization.h"
@@ -26,42 +25,37 @@ bool ProjectResourcesCopier::CopyAllResourcesTo(
    bool preserveAbsoluteFilenames,
    bool preserveDirectoryStructure) {
  if (updateOriginalProject) {
-    gd::ProjectResourcesCopier::CopyAllResourcesTo(
-        originalProject, originalProject, fs, destinationDirectory,
-        preserveAbsoluteFilenames, preserveDirectoryStructure);
+    gd::ProjectResourcesCopier::AdaptFilePathsAndCopyAllResourcesTo(
+        originalProject, fs, destinationDirectory, preserveAbsoluteFilenames,
+        preserveDirectoryStructure);
  } else {
    gd::Project clonedProject = originalProject;
-    gd::ProjectResourcesCopier::CopyAllResourcesTo(
-        originalProject, clonedProject, fs, destinationDirectory,
-        preserveAbsoluteFilenames, preserveDirectoryStructure);
+    gd::ProjectResourcesCopier::AdaptFilePathsAndCopyAllResourcesTo(
+        clonedProject, fs, destinationDirectory, preserveAbsoluteFilenames,
+        preserveDirectoryStructure);
  }
  return true;
 }

-bool ProjectResourcesCopier::CopyAllResourcesTo(
-    gd::Project& originalProject,
-    gd::Project& clonedProject,
+bool ProjectResourcesCopier::AdaptFilePathsAndCopyAllResourcesTo(
+    gd::Project& project,
    AbstractFileSystem& fs,
    gd::String destinationDirectory,
    bool preserveAbsoluteFilenames,
    bool preserveDirectoryStructure) {

-  // Check if there are some resources with absolute filenames
-  gd::ResourcesAbsolutePathChecker absolutePathChecker(originalProject.GetResourcesManager(), fs);
-  gd::ResourceExposer::ExposeWholeProjectResources(originalProject, absolutePathChecker);
-
-  auto projectDirectory = fs.DirNameFrom(originalProject.GetProjectFile());
+  auto projectDirectory = fs.DirNameFrom(project.GetProjectFile());
  std::cout << "Copying all resources from " << projectDirectory << " to "
            << destinationDirectory << "..." << std::endl;

  // Get the resources to be copied
  gd::ResourcesMergingHelper resourcesMergingHelper(
-      clonedProject.GetResourcesManager(), fs);
+      project.GetResourcesManager(), fs);
  resourcesMergingHelper.SetBaseDirectory(projectDirectory);
  resourcesMergingHelper.PreserveDirectoriesStructure(
      preserveDirectoryStructure);
  resourcesMergingHelper.PreserveAbsoluteFilenames(preserveAbsoluteFilenames);
-  gd::ResourceExposer::ExposeWholeProjectResources(clonedProject,
+  gd::ResourceExposer::ExposeWholeProjectResources(project,
                                                    resourcesMergingHelper);

  // Copy resources
--- a/Core/GDCore/IDE/Project/ProjectResourcesCopier.h
+++ b/Core/GDCore/IDE/Project/ProjectResourcesCopier.h
@@ -50,12 +50,10 @@ class GD_CORE_API ProjectResourcesCopier {
                                 bool preserveDirectoryStructure = true);

 private:
-  static bool CopyAllResourcesTo(gd::Project& originalProject,
-                                 gd::Project& clonedProject,
-                                 gd::AbstractFileSystem& fs,
-                                 gd::String destinationDirectory,
-                                 bool preserveAbsoluteFilenames = true,
-                                 bool preserveDirectoryStructure = true);
+  static bool AdaptFilePathsAndCopyAllResourcesTo(
+      gd::Project &project, gd::AbstractFileSystem &fs,
+      gd::String destinationDirectory, bool preserveAbsoluteFilenames = true,
+      bool preserveDirectoryStructure = true);
 };

 }  // namespace gd
--- a/Core/GDCore/IDE/Project/ResourcesAbsolutePathChecker.cpp
+++ b/Core/GDCore/IDE/Project/ResourcesAbsolutePathChecker.cpp
@@ -1,17 +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 "ResourcesAbsolutePathChecker.h"
-#include "GDCore/IDE/AbstractFileSystem.h"
-#include "GDCore/String.h"
-
-namespace gd {
-
-void ResourcesAbsolutePathChecker::ExposeFile(gd::String& resourceFilename) {
-  if (fs.IsAbsolute(resourceFilename)) hasAbsoluteFilenames = true;
-}
-
-}  // namespace gd
--- a/Core/GDCore/IDE/Project/ResourcesAbsolutePathChecker.h
+++ b/Core/GDCore/IDE/Project/ResourcesAbsolutePathChecker.h
@@ -1,48 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-#pragma once
-
-#include "GDCore/IDE/AbstractFileSystem.h"
-#include "GDCore/IDE/Project/ArbitraryResourceWorker.h"
-#include "GDCore/String.h"
-
-namespace gd {
-
-/**
- * \brief Helper used to check if a project has at least a resource with an
- * absolute filename.
- *
- * \see ArbitraryResourceWorker
- *
- * \ingroup IDE
- */
-class GD_CORE_API ResourcesAbsolutePathChecker
-    : public ArbitraryResourceWorker {
-public:
-  ResourcesAbsolutePathChecker(gd::ResourcesManager &resourcesManager,
-                               AbstractFileSystem &fileSystem)
-      : ArbitraryResourceWorker(resourcesManager), hasAbsoluteFilenames(false),
-        fs(fileSystem){};
-  virtual ~ResourcesAbsolutePathChecker(){};
-
-  /**
-   * Return true if there is at least a resource with an absolute filename.
-   */
-  bool HasResourceWithAbsoluteFilenames() const {
-    return hasAbsoluteFilenames;
-  };
-
-  /**
-   * Check if there is a resource with an absolute path
-   */
-  virtual void ExposeFile(gd::String& resource);
-
- private:
-  bool hasAbsoluteFilenames;
-  AbstractFileSystem& fs;
-};
-
-}  // namespace gd
--- a/Core/GDCore/IDE/Project/ResourcesInUseHelper.h
+++ b/Core/GDCore/IDE/Project/ResourcesInUseHelper.h
@@ -60,6 +60,7 @@ public:
    if (resourceType == "model3D") return allModel3Ds;
    if (resourceType == "atlas") return allAtlases;
    if (resourceType == "spine") return allSpines;
+    if (resourceType == "javascript") return allJavaScripts;

    return emptyResources;
  };
@@ -88,6 +89,9 @@ public:
  virtual void ExposeVideo(gd::String& resourceName) override {
    allVideos.insert(resourceName);
  };
+  virtual void ExposeJavaScript(gd::String& resourceName) override {
+    allJavaScripts.insert(resourceName);
+  };
  virtual void ExposeBitmapFont(gd::String& resourceName) override {
    allBitmapFonts.insert(resourceName);
  };
@@ -114,6 +118,7 @@ public:
  std::set<gd::String> allModel3Ds;
  std::set<gd::String> allAtlases;
  std::set<gd::String> allSpines;
+  std::set<gd::String> allJavaScripts;
  std::set<gd::String> emptyResources;

  static const std::vector<gd::String> resourceTypes;
--- a/Core/GDCore/IDE/Project/ResourcesMergingHelper.cpp
+++ b/Core/GDCore/IDE/Project/ResourcesMergingHelper.cpp
@@ -22,6 +22,14 @@ void ResourcesMergingHelper::ExposeFile(gd::String& resourceFilename) {
  resourceFullFilename = gd::AbstractFileSystem::NormalizeSeparator(
      resourceFullFilename);  // Protect against \ on Linux.

+  if (shouldUseOriginalAbsoluteFilenames) {
+    // There is no need to fill `newFilenames` and `oldFilenames` since the file
+    // location stays the same.
+    fs.MakeAbsolute(resourceFullFilename, baseDirectory);
+    resourceFilename = resourceFullFilename;
+    return;
+  }
+
  // In the case of absolute filenames that we don't want to preserve, or
  // in the case of copying files without preserving relative folders, the new
  // names will be generated from the filename alone (with collision protection).
--- a/Core/GDCore/IDE/Project/ResourcesMergingHelper.h
+++ b/Core/GDCore/IDE/Project/ResourcesMergingHelper.h
@@ -3,8 +3,7 @@
 * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
 * reserved. This project is released under the MIT License.
 */
-#ifndef RESOURCESMERGINGHELPER_H
-#define RESOURCESMERGINGHELPER_H
+#pragma once

 #include <map>
 #include <memory>
@@ -58,6 +57,15 @@ public:
    preserveAbsoluteFilenames = preserveAbsoluteFilenames_;
  };

+  /**
+   * \brief Set if the absolute filenames of original files must be used for
+   * any resource.
+   */
+  void SetShouldUseOriginalAbsoluteFilenames(
+      bool shouldUseOriginalAbsoluteFilenames_ = true) {
+    shouldUseOriginalAbsoluteFilenames = shouldUseOriginalAbsoluteFilenames_;
+  };
+
  /**
   * \brief Return a map containing the resources old absolute filename as key,
   * and the resources new filenames as value. The new filenames are relative to
@@ -93,10 +101,13 @@ public:
                                   ///< absolute (C:\MyFile.png  will not be
                                   ///< transformed into a relative filename
                                   ///< (MyFile.png).
+  /**
+   * Set to true if the absolute filenames of original files must be used for
+   * any resource.
+   */
+  bool shouldUseOriginalAbsoluteFilenames = false;
  gd::AbstractFileSystem&
      fs;  ///< The gd::AbstractFileSystem used to manipulate files.
 };

 }  // namespace gd
-
-#endif  // RESOURCESMERGINGHELPER_H
--- a/Core/GDCore/IDE/Project/ResourcesRenamer.h
+++ b/Core/GDCore/IDE/Project/ResourcesRenamer.h
@@ -59,6 +59,9 @@ class ResourcesRenamer : public gd::ArbitraryResourceWorker {
  virtual void ExposeVideo(gd::String& videoResourceName) override {
    RenameIfNeeded(videoResourceName);
  };
+  virtual void ExposeJavaScript(gd::String& javaScriptResourceName) override {
+    RenameIfNeeded(javaScriptResourceName);
+  };
  virtual void ExposeBitmapFont(gd::String& bitmapFontName) override {
    RenameIfNeeded(bitmapFontName);
  };
--- a/Core/GDCore/IDE/Project/SceneResourcesFinder.cpp
+++ b/Core/GDCore/IDE/Project/SceneResourcesFinder.cpp
@@ -6,6 +6,7 @@
 #include "SceneResourcesFinder.h"

 #include "GDCore/IDE/ResourceExposer.h"
+#include "GDCore/Project/EventsBasedObjectVariant.h"
 #include "GDCore/Project/Layout.h"
 #include "GDCore/Project/Project.h"
 #include "GDCore/Serialization/SerializerElement.h"
@@ -27,6 +28,14 @@ std::set<gd::String> SceneResourcesFinder::FindSceneResources(gd::Project &proje
  return resourceWorker.resourceNames;
 }

+std::set<gd::String> SceneResourcesFinder::FindEventsBasedObjectVariantResources(gd::Project &project,
+    gd::EventsBasedObjectVariant &variant) {
+  gd::SceneResourcesFinder resourceWorker(project.GetResourcesManager());
+
+  gd::ResourceExposer::ExposeEventsBasedObjectVariantResources(project, variant, resourceWorker);
+  return resourceWorker.resourceNames;
+}
+
 void SceneResourcesFinder::AddUsedResource(gd::String &resourceName) {
  if (resourceName.empty()) {
    return;
--- a/Core/GDCore/IDE/Project/SceneResourcesFinder.h
+++ b/Core/GDCore/IDE/Project/SceneResourcesFinder.h
@@ -15,6 +15,7 @@ namespace gd {
 class Project;
 class Layout;
 class SerializerElement;
+class EventsBasedObjectVariant;
 } // namespace gd

 namespace gd {
@@ -27,7 +28,7 @@ namespace gd {
 class SceneResourcesFinder : private gd::ArbitraryResourceWorker {
 public:
  /**
-   * @brief Find resource usages in a given scenes.
+   * @brief Find resource usages in a given scene.
   *
   * It doesn't include resources used globally.
   */
@@ -41,6 +42,13 @@ public:
   */
  static std::set<gd::String> FindProjectResources(gd::Project &project);

+  /**
+   * @brief Find resource usages in a given events-based object variant.
+   */
+  static std::set<gd::String>
+  FindEventsBasedObjectVariantResources(gd::Project &project,
+                                        gd::EventsBasedObjectVariant &variant);
+
  virtual ~SceneResourcesFinder(){};

 private:
@@ -74,6 +82,9 @@ private:
  void ExposeVideo(gd::String &videoResourceName) override {
    AddUsedResource(videoResourceName);
  };
+  void ExposeJavaScript(gd::String &javaScriptResourceName) override {
+    AddUsedResource(javaScriptResourceName);
+  };
  void ExposeBitmapFont(gd::String &bitmapFontName) override {
    AddUsedResource(bitmapFontName);
  };
--- a/Core/GDCore/IDE/ProjectBrowserHelper.cpp
+++ b/Core/GDCore/IDE/ProjectBrowserHelper.cpp
@@ -26,8 +26,24 @@ namespace gd {

 void ProjectBrowserHelper::ExposeProjectEvents(
    gd::Project &project, gd::ArbitraryEventsWorker &worker) {
-  // See also gd::Project::ExposeResources for a method that traverses the whole
-  // project (this time for resources).
+  // See also gd::ResourceExposer::ExposeWholeProjectResources
+  // for a method that traverses the whole project (this time for resources).
+
+  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::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);

@@ -51,6 +67,28 @@ 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) {
@@ -106,48 +144,17 @@ void ProjectBrowserHelper::ExposeLayoutEventsAndDependencies(
  }
  for (const gd::String& sceneName : dependenciesAnalyzer.GetScenesDependencies()) {
    gd::Layout& dependencyLayout = project.GetLayout(sceneName);
-    
+
    worker.Launch(dependencyLayout.GetEvents());
  }
 }

-void ProjectBrowserHelper::ExposeProjectEvents(
-    gd::Project &project, gd::ArbitraryEventsWorkerWithContext &worker) {
-  // See also gd::Project::ExposeResources for a method that traverse 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.GetInternalVector()) {
+    for (auto &&eventsFunction :
+         eventsFunctionsExtension.GetEventsFunctions().GetInternalVector()) {
      worker.Launch(eventsFunction->GetEvents());
    }

@@ -169,13 +176,18 @@ void ProjectBrowserHelper::ExposeEventsFunctionsExtensionEvents(
    gd::Project &project, const gd::EventsFunctionsExtension &eventsFunctionsExtension,
    gd::ArbitraryEventsWorkerWithContext &worker) {
    // Add (free) events functions
-    for (auto &&eventsFunction : eventsFunctionsExtension.GetInternalVector()) {
+    for (auto &&eventsFunction :
+         eventsFunctionsExtension.GetEventsFunctions().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);
+              parameterObjectsContainer, parameterVariablesContainer);

      worker.Launch(eventsFunction->GetEvents(), projectScopedContainers);
    }
@@ -207,15 +219,32 @@ 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);
+            *eventsFunction, parameterObjectsContainers,
+            parameterVariablesContainer, propertyVariablesContainer);

    worker.Launch(eventsFunction->GetEvents(), projectScopedContainers);
  }
@@ -235,15 +264,31 @@ 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);
+            *eventsFunction, parameterObjectsContainers,
+            parameterVariablesContainer, propertyVariablesContainer);

    worker.Launch(eventsFunction->GetEvents(), projectScopedContainers);
  }
@@ -269,6 +314,12 @@ 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());
+      }
    }
  }
 };
@@ -281,13 +332,19 @@ void ProjectBrowserHelper::ExposeLayoutObjects(gd::Layout &layout,
  worker.Launch(layout.GetObjects());
 }

+void ProjectBrowserHelper::ExposeEventsBasedObjectVariantObjects(
+    gd::EventsBasedObjectVariant &eventsBasedObjectVariant,
+    gd::ArbitraryObjectsWorker &worker) {
+  worker.Launch(eventsBasedObjectVariant.GetObjects());
+}
+
 void ProjectBrowserHelper::ExposeProjectFunctions(
    gd::Project &project, gd::ArbitraryEventsFunctionsWorker &worker) {

  for (std::size_t e = 0; e < project.GetEventsFunctionsExtensionsCount();
       e++) {
    auto &eventsFunctionsExtension = project.GetEventsFunctionsExtension(e);
-    worker.Launch(eventsFunctionsExtension);
+    worker.Launch(eventsFunctionsExtension.GetEventsFunctions());

    for (auto &&eventsBasedBehavior :
         eventsFunctionsExtension.GetEventsBasedBehaviors()
--- a/Core/GDCore/IDE/ProjectBrowserHelper.h
+++ b/Core/GDCore/IDE/ProjectBrowserHelper.h
@@ -13,12 +13,14 @@ class EventsFunctionsExtension;
 class EventsFunction;
 class EventsBasedBehavior;
 class EventsBasedObject;
+class EventsBasedObjectVariant;
 class ArbitraryEventsWorker;
 class ArbitraryEventsWorkerWithContext;
 class ArbitraryEventsFunctionsWorker;
 class ArbitraryObjectsWorker;
 class ArbitraryEventBasedBehaviorsWorker;
 class ArbitraryBehaviorSharedDataWorker;
+class VariablesContainer;
 } // namespace gd

 namespace gd {
@@ -56,6 +58,15 @@ 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.
@@ -127,6 +138,20 @@ 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.
@@ -152,6 +177,20 @@ 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...)
@@ -169,6 +208,17 @@ public:
  static void ExposeLayoutObjects(gd::Layout &layout,
                                  gd::ArbitraryObjectsWorker &worker);

+  /**
+   * \brief Call the specified worker on all ObjectContainers of the
+   * events-based object variant.
+   *
+   * This should be the preferred way to traverse all the objects of an
+   * events-based object variant.
+   */
+  static void ExposeEventsBasedObjectVariantObjects(
+      gd::EventsBasedObjectVariant &eventsBasedObjectVariant,
+      gd::ArbitraryObjectsWorker &worker);
+
  /**
   * \brief Call the specified worker on all FunctionsContainers 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.ClearEventsFunctions();
+    extension.GetEventsFunctions().ClearEventsFunctions();
  }
 }

--- a/Core/GDCore/IDE/PropertyFunctionGenerator.cpp
+++ b/Core/GDCore/IDE/PropertyFunctionGenerator.cpp
@@ -42,6 +42,9 @@ 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;
@@ -59,9 +62,9 @@ void PropertyFunctionGenerator::GenerateGetterAndSetter(
      property.GetLabel().empty() ? property.GetName() : property.GetLabel();

  gd::String descriptionSubject =
-      (property.GetType() == "Boolean" ? "if " : "the ") +
+      (primitiveType == "boolean" ? "if " : "the ") +
      UnCapitalizeFirstLetter(propertyLabel) +
-      (isSharedProperties || property.GetType() == "Boolean"
+      (isSharedProperties || primitiveType == "boolean"
           ? "."
           : " of the object.") +
      (property.GetDescription().empty() ? ""
@@ -71,19 +74,7 @@ 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(
@@ -99,7 +90,7 @@ void PropertyFunctionGenerator::GenerateGetterAndSetter(
        .SetName(legacyExpressionType)
        .SetExtraInfo(GetStringifiedExtraInfo(property));
    getter.SetFullName(propertyLabel).SetGroup(functionGroupName);
-    if (property.GetType() == "Boolean") {
+    if (primitiveType == "boolean") {
      getter.SetFunctionType(gd::EventsFunction::Condition)
          .SetDescription("Check " + descriptionSubject)
          .SetSentence("_PARAM0_ " + UnCapitalizeFirstLetter(propertyLabel));
@@ -112,13 +103,12 @@ void PropertyFunctionGenerator::GenerateGetterAndSetter(
    auto &event =
        dynamic_cast<gd::StandardEvent &>(getter.GetEvents().InsertNewEvent(
            project, "BuiltinCommonInstructions::Standard", 0));
-    if (property.GetType() == "Boolean") {
+    if (primitiveType == "boolean") {
      gd::Instruction condition;
-      condition.SetType(getterType);
-      condition.AddParameter("Object");
-      if (isBehavior) {
-        condition.AddParameter("Behavior");
-      }
+      condition.SetType("BooleanVariable");
+      condition.AddParameter(propertyName);
+      condition.AddParameter("True");
+      condition.AddParameter("");
      event.GetConditions().Insert(condition, 0);

      gd::Instruction action;
@@ -127,6 +117,8 @@ 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);
@@ -136,7 +128,7 @@ void PropertyFunctionGenerator::GenerateGetterAndSetter(
  if (!functionsContainer.HasEventsFunctionNamed(setterName)) {
    auto &setter = functionsContainer.InsertNewEventsFunction(
        setterName, functionsContainer.GetEventsFunctionsCount());
-    if (property.GetType() == "Boolean") {
+    if (primitiveType == "boolean") {
      setter.SetFunctionType(gd::EventsFunction::Action)
          .SetFullName(propertyLabel)
          .SetGroup(functionGroupName)
@@ -177,26 +169,24 @@ void PropertyFunctionGenerator::GenerateGetterAndSetter(
      setter.SetGetterName(getterName);
    }

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

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

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

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

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

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

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

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

 }  // namespace gd
-
-#endif  // GDCORE_PROPERTYFUNCTIONGENERATOR_H
--- a/Core/GDCore/IDE/ResourceExposer.cpp
+++ b/Core/GDCore/IDE/ResourceExposer.cpp
@@ -5,21 +5,22 @@
 */
 #include "ResourceExposer.h"

+#include "GDCore/Extensions/Metadata/EffectMetadata.h"
+#include "GDCore/Extensions/Metadata/MetadataProvider.h"
+#include "GDCore/Extensions/Platform.h"
 #include "GDCore/IDE/Events/ArbitraryEventsWorker.h"
 #include "GDCore/IDE/Project/ArbitraryResourceWorker.h"
 #include "GDCore/IDE/ProjectBrowserHelper.h"
+#include "GDCore/Project/Effect.h"
 #include "GDCore/Project/EventsFunctionsExtension.h"
 #include "GDCore/Project/Layout.h"
 #include "GDCore/Project/Project.h"
-#include "GDCore/Project/Effect.h"
 #include "GDCore/String.h"
-#include "GDCore/Extensions/Platform.h"
-#include "GDCore/Extensions/Metadata/MetadataProvider.h"
-#include "GDCore/Extensions/Metadata/EffectMetadata.h"

 namespace gd {

-void ResourceExposer::ExposeWholeProjectResources(gd::Project& project, gd::ArbitraryResourceWorker& worker) {
+void ResourceExposer::ExposeWholeProjectResources(
+    gd::Project &project, gd::ArbitraryResourceWorker &worker) {
  // See also gd::ProjectBrowserHelper::ExposeProjectEvents for a method that
  // traverse the whole project (this time for events) and ExposeProjectEffects
  // (this time for effects).
@@ -31,13 +32,11 @@ void ResourceExposer::ExposeWholeProjectResources(gd::Project& project, gd::Arbi

  // Expose event resources
  auto eventWorker = gd::GetResourceWorkerOnEvents(project, worker);
-  gd::ProjectBrowserHelper::ExposeProjectEvents(
-    project, eventWorker);
+  gd::ProjectBrowserHelper::ExposeProjectEvents(project, eventWorker);

  // Expose object configuration resources
  auto objectWorker = gd::GetResourceWorkerOnObjects(project, worker);
-  gd::ProjectBrowserHelper::ExposeProjectObjects(
-    project, objectWorker);
+  gd::ProjectBrowserHelper::ExposeProjectObjects(project, objectWorker);

  // Expose layer effect resources
  for (std::size_t layoutIndex = 0; layoutIndex < project.GetLayoutsCount();
@@ -52,28 +51,47 @@ void ResourceExposer::ExposeWholeProjectResources(gd::Project& project, gd::Arbi
      for (size_t effectIndex = 0; effectIndex < effects.GetEffectsCount();
           effectIndex++) {
        auto &effect = effects.GetEffect(effectIndex);
-        gd::ResourceExposer::ExposeEffectResources(project.GetCurrentPlatform(),
-                                                   effect, worker);
+        gd::ResourceExposer::ExposeEffectResources(
+            project.GetCurrentPlatform(), effect, worker);
      }
    }
  }

  // Expose loading screen background image if present
-  auto& loadingScreen = project.GetLoadingScreen();
+  auto &loadingScreen = project.GetLoadingScreen();
  if (loadingScreen.GetBackgroundImageResourceName() != "")
    worker.ExposeImage(loadingScreen.GetBackgroundImageResourceName());
+
+  // Expose extension source files
+  for (std::size_t e = 0; e < project.GetEventsFunctionsExtensionsCount();
+       e++) {
+    auto &eventsFunctionsExtension = project.GetEventsFunctionsExtension(e);
+    ExposeExtensionResources(eventsFunctionsExtension, worker);
+  }
 }

-void ResourceExposer::ExposeProjectResources(gd::Project& project, gd::ArbitraryResourceWorker& worker) {
+void ResourceExposer::ExposeProjectResources(
+    gd::Project &project, gd::ArbitraryResourceWorker &worker) {
  // 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(
-    gd::Project &project, gd::Layout &layout,
+    gd::Project &project,
+    gd::Layout &layout,
    gd::ArbitraryResourceWorker &worker) {
-
  // Expose object configuration resources
  auto objectWorker = gd::GetResourceWorkerOnObjects(project, worker);
  gd::ProjectBrowserHelper::ExposeLayoutObjects(layout, objectWorker);
@@ -87,28 +105,48 @@ void ResourceExposer::ExposeLayoutResources(
    for (size_t effectIndex = 0; effectIndex < effects.GetEffectsCount();
         effectIndex++) {
      auto &effect = effects.GetEffect(effectIndex);
-      gd::ResourceExposer::ExposeEffectResources(project.GetCurrentPlatform(),
-                                                 effect, worker);
+      gd::ResourceExposer::ExposeEffectResources(
+          project.GetCurrentPlatform(), effect, worker);
    }
  }

  // Expose event resources
  auto eventWorker = gd::GetResourceWorkerOnEvents(project, worker);
-  gd::ProjectBrowserHelper::ExposeLayoutEventsAndDependencies(project, layout,
-                                                              eventWorker);
+  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::ExposeEventsBasedObjectVariantResources(
+    gd::Project &project,
+    gd::EventsBasedObjectVariant &eventsBasedObjectVariant,
+    gd::ArbitraryResourceWorker &worker) {
+  // Expose object configuration resources
+  auto objectWorker = gd::GetResourceWorkerOnObjects(project, worker);
+  gd::ProjectBrowserHelper::ExposeEventsBasedObjectVariantObjects(
+      eventsBasedObjectVariant, objectWorker);
+
+  // Expose layer effect resources
+  auto &layers = eventsBasedObjectVariant.GetLayers();
+  for (std::size_t layerIndex = 0; layerIndex < layers.GetLayersCount();
+       layerIndex++) {
+    auto &layer = layers.GetLayer(layerIndex);
+
+    auto &effects = layer.GetEffects();
+    for (size_t effectIndex = 0; effectIndex < effects.GetEffectsCount();
+         effectIndex++) {
+      auto &effect = effects.GetEffect(effectIndex);
+      gd::ResourceExposer::ExposeEffectResources(project.GetCurrentPlatform(),
+                                                 effect, worker);
+    }
  }
+  // We don't check the events because it would cost too much to do it for every
+  // variant. Resource usage in events-based object events and their
+  // dependencies should be rare.
 }

 void ResourceExposer::ExposeEffectResources(
-    gd::Platform &platform, gd::Effect &effect,
+    gd::Platform &platform,
+    gd::Effect &effect,
    gd::ArbitraryResourceWorker &worker) {
  auto &effectMetadata =
      MetadataProvider::GetEffectMetadata(platform, effect.GetEffectType());
@@ -127,11 +165,20 @@ void ResourceExposer::ExposeEffectResources(
        worker.ExposeResourceWithType(resourceType,
                                      potentiallyUpdatedResourceName);
        if (potentiallyUpdatedResourceName != resourceName) {
-          effect.SetStringParameter(propertyName, potentiallyUpdatedResourceName);
+          effect.SetStringParameter(propertyName,
+                                    potentiallyUpdatedResourceName);
        }
      }
    }
  }
 }

-} // namespace gd
+void ResourceExposer::ExposeExtensionResources(
+    gd::EventsFunctionsExtension &extension,
+    gd::ArbitraryResourceWorker &worker) {
+  for (auto &sourceFile : extension.GetAllSourceFiles()) {
+    worker.ExposeJavaScript(sourceFile.GetResourceName());
+  }
+}
+
+}  // namespace gd
--- a/Core/GDCore/IDE/ResourceExposer.h
+++ b/Core/GDCore/IDE/ResourceExposer.h
@@ -9,6 +9,8 @@ namespace gd {
 class Platform;
 class Project;
 class ArbitraryResourceWorker;
+class EventsBasedObjectVariant;
+class EventsFunctionsExtension;
 class Effect;
 class Layout;
 } // namespace gd
@@ -34,7 +36,7 @@ public:

  /**
   * @brief Expose only the resources used globally on a project.
-   * 
+   *
   * It doesn't include resources used in layouts.
   */
  static void ExposeProjectResources(gd::Project &project,
@@ -42,17 +44,33 @@ public:

  /**
   * @brief Expose the resources used in a given layout.
-   * 
+   *
   * It doesn't include resources used globally.
   */
-  static void ExposeLayoutResources(gd::Project &project, gd::Layout &layout,
-                                          gd::ArbitraryResourceWorker &worker);
+  static void ExposeLayoutResources(gd::Project &project,
+                                    gd::Layout &layout,
+                                    gd::ArbitraryResourceWorker &worker);
+
+  /**
+   * @brief Expose the resources used in a given events-based object variant.
+   */
+  static void ExposeEventsBasedObjectVariantResources(
+      gd::Project &project,
+      gd::EventsBasedObjectVariant &eventsBasedObjectVariant,
+      gd::ArbitraryResourceWorker &worker);

  /**
   * @brief Expose the resources used in a given effect.
   */
-  static void ExposeEffectResources(gd::Platform &platform, gd::Effect &effect,
+  static void ExposeEffectResources(gd::Platform &platform,
+                                    gd::Effect &effect,
                                    gd::ArbitraryResourceWorker &worker);
+
+  /**
+   * @brief Expose the resources used in an extension.
+   */
+  static void ExposeExtensionResources(gd::EventsFunctionsExtension &extension,
+                                       gd::ArbitraryResourceWorker &worker);
 };

-} // namespace gd
+}  // namespace gd
--- 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/GroupVariableHelper.h"
+#include "GDCore/IDE/ObjectVariableHelper.h"
 #include "GDCore/IDE/EventBasedBehaviorBrowser.h"
 #include "GDCore/IDE/EventBasedObjectBrowser.h"
 #include "GDCore/IDE/Events/ArbitraryEventsWorker.h"
@@ -314,9 +314,16 @@ void WholeProjectRefactorer::ApplyRefactoringForVariablesContainer(
  variablesContainer.SerializeTo(editedSerializedVariables);
  variablesContainer.UnserializeFrom(originalSerializedVariables);

-  // Rename and remove variables
+  // 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;
  gd::EventsVariableReplacer eventsVariableReplacer(
-      project.GetCurrentPlatform(), changeset, changeset.removedVariableNames,
+      project.GetCurrentPlatform(), changeset, removedVariableNames,
      variablesContainer);
  gd::ProjectBrowserHelper::ExposeProjectEvents(project,
                                                eventsVariableReplacer);
@@ -333,9 +340,25 @@ 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,
@@ -355,11 +378,15 @@ void WholeProjectRefactorer::ApplyRefactoringForGroupVariablesContainer(
    }
    auto &object = hasObject ? objectsContainer.GetObject(objectName)
                             : globalObjectsContainer.GetObject(objectName);
-    auto &variablesContainer = object.GetVariables();
+    auto &objectVariablesContainer = object.GetVariables();
+
+    gd::ObjectVariableHelper::ApplyChangesToObjectInstances(
+      objectVariablesContainer, initialInstancesContainer, objectName,
+      changeset);

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

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

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

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

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

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

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

  if (eventsFunction.GetFunctionType() ==
      gd::EventsFunction::ExpressionAndCondition) {
-    for (auto &&otherFunction : eventsFunctionsExtension.GetInternalVector()) {
+    for (auto &&otherFunction : eventsFunctions.GetInternalVector()) {
      if (otherFunction->GetFunctionType() ==
              gd::EventsFunction::ActionWithOperator &&
          otherFunction->GetGetterName() == oldFunctionName) {
@@ -862,16 +892,34 @@ 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) {
-  if (!eventsFunctionsExtension.HasEventsFunctionNamed(functionName))
+  const auto &eventsFunctions = eventsFunctionsExtension.GetEventsFunctions();
+  if (!eventsFunctions.HasEventsFunctionNamed(functionName))
    return;

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

  const gd::String &eventsFunctionType =
      gd::PlatformExtension::GetEventsFunctionFullType(
@@ -1175,6 +1223,42 @@ 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) {
@@ -1697,6 +1781,14 @@ 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) {
@@ -2045,6 +2137,26 @@ 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/Show More
+++ b/Show More