[WIP] Fix ghost object when an object with the Physics engine is deleted

* This was happening when an object with the Physics behavior is deleted and then manipulated by other actions before the end of the current frame.
2025-10-15 10:19:04 +00:00 · 2022-03-24 16:15:04 +01:00
3833 changed files with 261154 additions and 385090 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -2,20 +2,13 @@
 # on the Electron runtime (newIDE/electron-app) for macOS and Linux.
 # For Windows, see the appveyor.yml file.

-# This also builds GDevelop.js and store it on a S3 so it can be used to run
-# GDevelop without building it from scratch.
-
-# Note that these CircleCI builds/tests are not launched on Pull Requests from forks,
-# to avoid sharing secrets.
-
 version: 2.1
 orbs:
  aws-cli: circleci/aws-cli@2.0.6
 jobs:
-  # Build the **entire** app for macOS.
  build-macos:
    macos:
-      xcode: 14.2.0
+      xcode: 12.5.1
    steps:
      - checkout

@@ -30,7 +23,7 @@ jobs:

      - 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 ..
+          command: git clone https://github.com/juj/emsdk.git && cd emsdk && ./emsdk install 1.39.6 && ./emsdk activate 1.39.6 && cd ..

      # GDevelop.js dependencies
      - restore_cache:
@@ -62,14 +55,13 @@ jobs:

      # 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).
-      # To test signing the code in the CI, add "export CSC_FOR_PULL_REQUEST=true && " before the command.
      - run:
          name: Build GDevelop IDE
-          command: export CSC_FOR_PULL_REQUEST=true && export NODE_OPTIONS="--max-old-space-size=7168" && cd newIDE/electron-app && CI=false npm run build -- --mac --publish=never
+          command: export NODE_OPTIONS="--max-old-space-size=7168" && cd newIDE/electron-app && npm run build -- --mac --publish=never

      - run:
          name: Clean dist folder to keep only installers/binaries.
-          command: rm -rf "newIDE/electron-app/dist/mac-universal/GDevelop 5.app"
+          command: rm -rf "newIDE/electron-app/dist/mac/GDevelop 5.app"

      # Upload artifacts (CircleCI)
      - store_artifacts:
@@ -83,7 +75,6 @@ jobs:
          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/

-  # Build the **entire** app for Linux.
  build-linux:
    # CircleCI docker workers are failing if they don't have enough memory (no swap)
    resource_class: xlarge
@@ -102,12 +93,12 @@ jobs:
          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
+         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 ..
+          command: git clone https://github.com/juj/emsdk.git && cd emsdk && ./emsdk install 1.39.6 && ./emsdk activate 1.39.6 && cd ..

      - run:
          name: Install system dependencies for Electron builder
@@ -127,8 +118,7 @@ jobs:
      # 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 ..
+          command: cd GDevelop.js && source ../emsdk/emsdk_env.sh && npm run build && npm test && cd ..

      # GDevelop IDE dependencies (after building GDevelop.js to avoid downloading a pre-built version)
      - run:
@@ -145,11 +135,11 @@ jobs:
      # Build GDevelop IDE (seems like we need to allow Node.js to use more space than usual)
      - run:
          name: Build GDevelop IDE
-          command: export NODE_OPTIONS="--max-old-space-size=7168" && cd newIDE/electron-app && npm run build -- --linux --publish=never
+          command: export NODE_OPTIONS="--max-old-space-size=7168" && cd newIDE/electron-app && npm run build -- --linux AppImage --publish=never

      - run:
          name: Clean dist folder to keep only installers/binaries.
-          command: rm -rf newIDE/electron-app/dist/linux-unpacked && rm -rf newIDE/electron-app/dist/linux-arm64-unpacked
+          command: rm -rf newIDE/electron-app/dist/linux-unpacked

      # Upload artifacts (CircleCI)
      - store_artifacts:
@@ -163,68 +153,10 @@ jobs:
          name: Deploy to S3 (latest)
          command: aws s3 sync newIDE/electron-app/dist s3://gdevelop-releases/$(git rev-parse --abbrev-ref HEAD)/latest/

-  # Build the WebAssembly library only (so that it's cached on a S3 and easy to re-use).
-  build-gdevelop_js-wasm-only:
-    docker:
-      - image: cimg/node:16.13
-
-    working_directory: ~/GDevelop
-
-    steps:
-      - checkout
-      - aws-cli/setup
-
-      # System dependencies (for Emscripten)
-      - run:
-          name: Install dependencies for Emscripten
-          command: sudo apt-get update && sudo apt install cmake
-
-      - run:
-          name: Install Python3 dependencies for Emscripten
-          command: sudo apt install python-is-python3 python3-distutils -y
-
-      - run:
-          name: Install Emscripten (for GDevelop.js)
-          command: git clone https://github.com/juj/emsdk.git && cd emsdk && ./emsdk install 3.1.21 && ./emsdk activate 3.1.21 && cd ..
-
-      # GDevelop.js dependencies
-      - restore_cache:
-          keys:
-            - gdevelop.js-linux-nodejs-dependencies-{{ checksum "GDevelop.js/package-lock.json" }}
-            # fallback to using the latest cache if no exact match is found
-            - gdevelop.js-linux-nodejs-dependencies-
-
-      - run:
-          name: Install GDevelop.js dependencies and build it
-          command: cd GDevelop.js && npm install && cd ..
-
-      # Build GDevelop.js (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 ..
-
-      - save_cache:
-          paths:
-            - GDevelop.js/node_modules
-          key: gdevelop.js-linux-nodejs-dependencies-{{ checksum "GDevelop.js/package-lock.json" }}
-
-      # Upload artifacts (CircleCI)
-      - store_artifacts:
-          path: Binaries/embuild/GDevelop.js
-
-      # Upload artifacts (AWS)
-      - run:
-          name: Deploy to S3 (specific commit)
-          command: aws s3 sync Binaries/embuild/GDevelop.js s3://gdevelop-gdevelop.js/$(git rev-parse --abbrev-ref HEAD)/commit/$(git rev-parse HEAD)/
-      - run:
-          name: Deploy to S3 (latest)
-          command: aws s3 sync Binaries/embuild/GDevelop.js s3://gdevelop-gdevelop.js/$(git rev-parse --abbrev-ref HEAD)/latest/

 workflows:
  builds:
    jobs:
-      - build-gdevelop_js-wasm-only
      - build-macos:
          filters:
            branches:
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -0,0 +1,6 @@
+# This is the Dockerfile to create a "devcontainer". 
+# This is a way to quickly create a development environment,
+# that can be used with GitHub workspaces.
+
+# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.162.0/containers/codespaces-linux/.devcontainer/base.Dockerfile
+FROM mcr.microsoft.com/vscode/devcontainers/universal:1-focal
--- a/.devcontainer/README.md
+++ b/.devcontainer/README.md
@@ -0,0 +1,16 @@
+# Devcontainer (development environment in the cloud) for GDevelop (beta)
+
+A devcontainer is the configuration to run a cloud development environment, available remotely.
+This is notably used to run a **[GitHub Codespace](https://docs.github.com/en/github/developing-online-with-codespaces/about-codespaces)**. The advantage is that you can quickly experiment and do changes without installing anything on your computer.
+
+> ⚠️ This development environment is in beta, and not everything is supported. This is useful for playing a bit with GDevelop codebase or to make quick changes. **In particular, it's not possible to test your changes on GDJS** because only the web-app can be launched.
+
+It's recommended that you follow the usual [README](../newIDE/README.md) to get started, with development tools installed on your computer.
+
+## Start a GitHub workspace to work on GDevelop (beta)
+
+- Subscribe to the [beta edition of GitHub workspace](https://docs.github.com/en/github/developing-online-with-codespaces/about-codespaces#joining-the-beta).
+- In the repository GitHub page, click **Code** and then choose **Open with Codespaces**.
+- Wait for the Codespace to load and Visual Studio Code to open.
+- When it's ready, open a terminal in Visual Studio Code.
+- Follow the usual [README in `newIDE`](../newIDE/README.md) to get started, like you would do on your own computer.
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,14 +1,51 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
+// https://github.com/microsoft/vscode-dev-containers/tree/v0.162.0/containers/codespaces-linux
 {
-  "image": "mcr.microsoft.com/devcontainers/universal:2",
-  "onCreateCommand": "cd newIDE/app && npm install && cd ../electron-app && npm install",
-  "forwardPorts": [3000],
-  "customizations": {
-    "vscode": {
-      "extensions": [
-        "esbenp.prettier-vscode",
-        "ms-vscode.cpptools",
-        "flowtype.flow-for-vscode"
-      ]
-    }
-  }
+	"name": "GitHub Codespaces for GDevelop",
+	"build": {
+		"dockerfile": "Dockerfile"
+	},
+	"settings": {
+		"terminal.integrated.shell.linux": "/bin/zsh",
+		"go.toolsManagement.checkForUpdates": "off",
+		"go.useLanguageServer": true,
+		"go.gopath": "/go",
+		"go.goroot": "/usr/local/go",
+		"python.pythonPath": "/opt/python/latest/bin/python",
+		"python.linting.enabled": true,
+		"python.linting.pylintEnabled": true,
+		"python.formatting.autopep8Path": "/usr/local/py-utils/bin/autopep8",
+		"python.formatting.blackPath": "/usr/local/py-utils/bin/black",
+		"python.formatting.yapfPath": "/usr/local/py-utils/bin/yapf",
+		"python.linting.banditPath": "/usr/local/py-utils/bin/bandit",
+		"python.linting.flake8Path": "/usr/local/py-utils/bin/flake8",
+		"python.linting.mypyPath": "/usr/local/py-utils/bin/mypy",
+		"python.linting.pycodestylePath": "/usr/local/py-utils/bin/pycodestyle",
+		"python.linting.pydocstylePath": "/usr/local/py-utils/bin/pydocstyle",
+		"python.linting.pylintPath": "/usr/local/py-utils/bin/pylint",
+		"lldb.executable": "/usr/bin/lldb",
+		"files.watcherExclude": {
+			"**/target/**": true
+		}
+	},
+	"remoteUser": "codespace",
+	"overrideCommand": false,
+	"workspaceMount": "source=${localWorkspaceFolder},target=/home/codespace/workspace,type=bind,consistency=cached",
+	"workspaceFolder": "/home/codespace/workspace",
+	"runArgs": [ "--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined", "--privileged", "--init" ],
+
+	// Add the IDs of extensions you want installed when the container is created.
+	"extensions": [
+		"GitHub.vscode-pull-request-github",
+		"esbenp.prettier-vscode",
+		"ms-vscode.cpptools",
+		"xaver.clang-format",
+		"flowtype.flow-for-vscode"
+	],
+
+	// Use 'forwardPorts' to make a list of ports inside the container available locally.
+	// "forwardPorts": [],
+
+	// "oryx build" will automatically install your dependencies and attempt to build your project
+	"postCreateCommand": "oryx build -p virtualenv_name=.venv || echo 'Could not auto-build. Skipping.'"
 }
--- a/.github/ISSUE_TEMPLATE/--asset-store-submission.md
+++ b/.github/ISSUE_TEMPLATE/--asset-store-submission.md
@@ -1,19 +0,0 @@
---
-name: "📦 Asset Store submission"
-about: Submit a free asset pack for the GDevelop Asset Store.
-title: ''
-labels: "📦 Asset Store submission" 
-assignees: ''
-
---
-
-BEFORE opening a new submission, please make sure that you:
-
- You have packaged the asset pack according [these rules](https://wiki.gdevelop.io/gdevelop5/community/contribute-to-the-assets-store). Otherwise, your package may be rejected or we will ask you to do the changes.
-
-## Description
-
- License:
- Author:
- Link to the original website:
- Zip file:
--- a/.github/ISSUE_TEMPLATE/--automatic-crash.yml
+++ b/.github/ISSUE_TEMPLATE/--automatic-crash.yml
@@ -1,37 +0,0 @@
-name: 💥 Automatic crash report
-description: Do not use this template for bug reports. This template is only for automatic crash reports.
-body:
-  - type: textarea
-    id: description
-    attributes:
-      label: Describe what you were doing when the crash happened
-      description: If applicable, add screenshots to help explain your problem.
-      placeholder: |
-        1. Went to '...'
-        2. Clicked on '...'
-        3. Scrolled down to '...'
-        4. Saw error
-  - type: input
-    id: gdevelop_version
-    attributes:
-      label: GDevelop version
-      description: |
-        The version of GDevelop used. Leave the prefilled value.
-    validations:
-      required: true
-  - type: textarea
-    id: platform_info
-    attributes:
-      label: Platform info
-      description: |
-        The platform you are using GDevelop on. Leave the prefilled value.
-  - type: textarea
-    id: error_stack
-    attributes:
-      label: Additional error context
-      description: Additonal context about the problem. Leave the prefilled value.
-  - type: textarea
-    id: component_stack
-    attributes:
-      label: Additional component context
-      description: Additonal context about the problem. Leave the prefilled value.
--- a/.github/ISSUE_TEMPLATE/--bug-report.md
+++ b/.github/ISSUE_TEMPLATE/--bug-report.md
@@ -0,0 +1,28 @@
+---
+name: "\U0001F41BBug report"
+about: Create a bug report about GDevelop or the game engine
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+## Describe the bug
+A clear and concise description of what the bug is.
+
+Please double check that the bug is not already reported in the issues list.
+
+## To Reproduce
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+* Please include a link to a game if possible!
+* If applicable, add screenshots to help explain your problem.
+
+## Other details
+* Include any OS/browser version/smartphone that you're using
+* Which version of GDevelop are you using? The desktop app or the web-app?
+* Add any other context about the problem here.
--- a/.github/ISSUE_TEMPLATE/--bug-report.yml
+++ b/.github/ISSUE_TEMPLATE/--bug-report.yml
@@ -1,78 +0,0 @@
-name: 🐛Bug report
-description: Create a bug report about GDevelop or the game engine
-body:
-  - type: checkboxes
-    id: searched_issues
-    attributes:
-      label: Is there an existing issue for this?
-      options:
-        - label: I have searched the [existing issues](https://github.com/4ian/GDevelop/issues)
-          required: true
-  - type: textarea
-    id: description
-    attributes:
-      label: Describe the bug
-      description: A clear and concise description of what the bug is.
-    validations:
-      required: true
-  - type: textarea
-    id: reproduction_steps
-    attributes:
-      label: Steps to reproduce
-      description: |
-        * Please include a link to a game if possible!
-        * If applicable, add screenshots to help explain your problem.
-      placeholder: |
-        1. Go to '...'
-        2. Click on '...'
-        3. Scroll down to '...'
-        4. See error
-    validations:
-      required: true
-  - type: dropdown
-    id: platform
-    attributes:
-      label: GDevelop platform
-      description: Which platform of GDevelop are you using?
-      multiple: true
-      options:
-        - Desktop
-        - Web
-        - Mobile
-    validations:
-      required: true
-  - type: input
-    id: gdevelop_version
-    attributes:
-      label: GDevelop version
-      description: |
-        Which version of GDevelop are you using?
-        Take a look here: [Editor Home - About GDevelop - "This version of GDevelop is: ~~~"]
-      placeholder: 5.1.159? 5.1.160?
-    validations:
-      required: true
-  - type: textarea
-    id: platform_info
-    attributes:
-      label: Platform info
-      value: |
-        <details>
-
-        *OS (e.g. Windows, Linux, macOS, Android, iOS)*
-        >
-
-        *OS Version (e.g. Windows 10, macOS 10.15)*
-        >
-
-        *Browser(For Web) (e.g. Chrome, Firefox, Safari)*
-        >
-
-        *Device(For Mobile) (e.g. iPhone 12, Samsung Galaxy S21)*
-        >
-
-        </details>
-  - type: textarea
-    id: additional_context
-    attributes:
-      label: Additional context
-      description: Add any other context about the problem here.
--- a/.github/ISSUE_TEMPLATE/--feature-request.md
+++ b/.github/ISSUE_TEMPLATE/--feature-request.md
@@ -10,11 +10,11 @@ assignees: ''

 BEFORE opening a new feature request, please make sure that you:

-   Understand the implications of your feature with the help of [the Forum](https://forum.gdevelop.io/c/gdevelop-general/feature-requests/35), OR
-   Peer-reviewed it with other users on Discord,
-   Consider commenting on the [Feature Request Forum](https://forum.gdevelop.io/c/gdevelop-general/feature-requests/35) if something is important for you
+-   Discussed it on the discord or the forum,
+-   There is not already a suggestion about it in the issues or in the roadmap: https://trello.com/b/qf0lM7k8/gdevelop-roadmap
+-   Consider commenting on the roadmap if something is important for you

-AFTER opening the feature request, the issue will be closed by a maintainer (@4ian or someone else) and a card will be added in [the public roadmap](https://trello.com/b/qf0lM7k8/gdevelop-ideas-box) if it's relevant and does not exist yet :)
+AFTER opening the feature request, the issue will be closed by a maintainer (@4ian or someone else) and a card will be added in the roadmap if it's relevant and does not exist yet :)

 ## Description

--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -4,14 +4,14 @@ contact_links:
    url: https://discord.gg/rjdYHvj
    about: Discuss on the forum or on the Discord to get help creating a game or identifying a bug.
  - name: GDevelop Forums
-    url: https://forum.gdevelop.io
+    url: https://forum.gdevelop-app.com
    about: You can also discuss game creation, new feature requests and bugs on the forum.
  - name: GDevelop Roadmap
    url: https://trello.com/b/qf0lM7k8/gdevelop-roadmap
    about: Look at the roadmap and vote on features that you want to see in GDevelop.
  - name: Submit a new game example that you created
    url: https://github.com/GDevelopApp/GDevelop-examples/issues/new/choose
-    about: You can submit a game that you made to be added to examples in the "GDevelop-examples" repository
+    about: You can submit a game that you made to be added to examples in the "GDevelop-examples" repository 
  - name: Submit a new game extension that you created
    url: https://github.com/4ian/GDevelop-extensions/issues/new/choose
-    about: You can submit an extension that you made in the "GDevelop-extensions" repository
+    about: You can submit an extension that you made in the "GDevelop-extensions" repository 
--- a/.github/workflows/build-storybook.yml
+++ b/.github/workflows/build-storybook.yml
@@ -9,10 +9,6 @@ name: Build Storybook
 on:
  # Launch on all commits.
  push:
-    branches:
-      - "**"
-    tags-ignore:
-      - "**" # Don't run on new tags
  # Allows to run this workflow manually from the Actions tab,
  # to publish on Chromatic (not done by default).
  workflow_dispatch:
@@ -21,23 +17,27 @@ jobs:
  build-storybook:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 50
-
-      - uses: actions/setup-node@v3
-        with:
-          node-version: 16
-          cache: "npm"
-          cache-dependency-path: "newIDE/app/package-lock.json"
-
      - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@v2
+        uses: aws-actions/configure-aws-credentials@v1
        with:
          aws-access-key-id: ${{ secrets.BUILD_STORYBOOK_AWS_ACCESS_KEY_ID }}
          aws-secret-access-key: ${{ secrets.BUILD_STORYBOOK_AWS_SECRET_ACCESS_KEY }}
          aws-region: us-east-1

+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 50
+
+      # Cache npm dependencies to speed up the workflow
+      - name: Cache node modules
+        uses: actions/cache@v2
+        env:
+          cache-name: cache-newIDE-app-node_modules
+        with:
+          # npm cache files are stored in `~/.npm` on Linux/macOS
+          path: ~/.npm
+          key: ${{ runner.os }}-${{ env.cache-name }}-${{ hashFiles('newIDE/app/package-lock.json') }}
+
      - name: Install newIDE dependencies
        run: npm install
        working-directory: newIDE/app
@@ -57,8 +57,8 @@ jobs:

      - name: Log urls to the Storybook
        run: |
-          echo "Find the latest Storybook for this branch on https://gdevelop-storybook.s3.amazonaws.com/$(git rev-parse --abbrev-ref HEAD)/latest/index.html"
-          echo "Find the Storybook for this commit on https://gdevelop-storybook.s3.amazonaws.com/$(git rev-parse --abbrev-ref HEAD)/commit/$(git rev-parse HEAD)/index.html"
+          echo "Find the latest Storybook for this branch on http://gdevelop-storybook.s3-website-us-east-1.amazonaws.com/$(git rev-parse --abbrev-ref HEAD)/latest/index.html"
+          echo "Find the Storybook for this commit on http://gdevelop-storybook.s3-website-us-east-1.amazonaws.com/$(git rev-parse --abbrev-ref HEAD)/commit/$(git rev-parse HEAD)/index.html"

      # Publish on Chromatic, only when manually launched (too costly to run on every commit).
      - name: Publish Storybook to Chromatic
--- a/.github/workflows/extract-translations.yml
+++ b/.github/workflows/extract-translations.yml
@@ -4,10 +4,6 @@ name: Extract translations
 on:
  # Execute for all commits (to ensure translations extraction works)
  push:
-    branches:
-      - "**"
-    tags-ignore:
-      - "**" # Don't run on new tags
  # Allows to run this workflow manually from the Actions tab.
  workflow_dispatch:

@@ -15,18 +11,23 @@ jobs:
  extract-translations:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v2
+
+      # Cache npm dependencies to speed up the workflow
+      - name: Cache node modules
+        uses: actions/cache@v2
+        env:
+          cache-name: cache-newIDE-app-node_modules
        with:
-          node-version: 16
-          cache: "npm"
-          cache-dependency-path: "newIDE/app/package-lock.json"
+          # npm cache files are stored in `~/.npm` on Linux/macOS
+          path: ~/.npm
+          key: ${{ runner.os }}-${{ env.cache-name }}-${{ hashFiles('newIDE/app/package-lock.json') }}

      - name: Install gettext
        run: sudo apt update && sudo apt install gettext -y

      - name: Install newIDE dependencies
-        run: npm ci
+        run: npm install
        working-directory: newIDE/app

      - name: Extract translations
@@ -37,7 +38,7 @@ jobs:
      - name: Install Crowdin CLI
        if: github.ref == 'refs/heads/master'
        run: npm i -g @crowdin/cli
-
+        
      - name: Upload translations to Crowdin
        run: crowdin upload sources
        if: github.ref == 'refs/heads/master'
--- a/.github/workflows/issues.yml
+++ b/.github/workflows/issues.yml
@@ -3,17 +3,41 @@ on:
  issues:
    types: [opened]
 jobs:
+  autoclose:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Autoclose issues about adding a bug without changing the bug report template
+      uses: arkon/issue-closer-action@v1.1
+      with:
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
+        type: "body"
+        regex: ".*Scroll down to '\\.\\.\\.\\.'.*"
+        message: "Hi @${issue.user.login}! 👋 This issue was automatically closed because it seems that you have not included any steps to reproduce the bug.\n\nGitHub is a place for the technical development of GDevelop itself - you may want to go on the [forum](https://forum.gdevelop-app.com/), the Discord chat or [read the documentation](http://wiki.compilgames.net/doku.php/gdevelop5/start) to learn more about GDevelop. Thanks!"
+    - name: Autoclose known beta 105 web-app update bug
+      uses: arkon/issue-closer-action@v1.1
+      with:
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
+        type: "body"
+        regex: ".*_instance.getRawFloatProperty is not a function.*"
+        message: "Hi @${issue.user.login}! 👋 This issue was automatically closed as this seems to be a known bug. It can be solved by **closing entirely the web-app and opening it again**. This will allow the web-app to auto-update and the problem should be gone."
+    - name: Autoclose known beta 114 web-app update bug
+      uses: arkon/issue-closer-action@v1.1
+      with:
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
+        type: "body"
+        regex: ".*getAssociatedSettings is not a function.*"
+        message: "Hi @${issue.user.login}! 👋 This issue was automatically closed as this seems to be a known bug. It can be solved by **closing entirely the web-app and opening it again**. This will allow the web-app to auto-update and the problem should be gone."
  autocomment:
    runs-on: ubuntu-latest
    if: contains(github.event.issue.body, 'The node to be removed is not a child of this node')
    steps:
-      - name: Autocomment indications on bug if it looks like #3453
-        uses: peter-evans/create-or-update-comment@v3
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          issue-number: ${{ github.event.issue.number }}
-          body: |
-            Hi @${{ github.actor }}!
-            Thank you for taking the time to open an issue.
+    - name: Autocomment indications on bug if it looks like #3453
+      uses: peter-evans/create-or-update-comment@v1
+      with:
+        issue-number: ${{ github.event.issue.number }}
+        body: |
+          Hi @${{ github.actor }}!
+          Thank you for taking the time to open an issue.

-            The solved issue #3453 mentioned a similar error, maybe it could help fix this new issue.
+          The solved issue #3453 mentioned a similar error, maybe it could help fix this new issue.
+        token: ${{ secrets.GITHUB_TOKEN }}
--- a/.github/workflows/pull-requests.yml
+++ b/.github/workflows/pull-requests.yml
@@ -1,53 +1,29 @@
 name: GDevelop Issues automatic workflow
 on:
  pull_request:
-    types: 
-      - opened
-      - reopened
-      - synchronize
+    types: [opened]
 jobs:
  read-locales-metadata:
-    if: github.event.pull_request.title == '[Auto PR] Update translations'
+    if: contains(github.event.pull_request.title, '[Auto PR] Update translations')
    runs-on: ubuntu-latest
-    env:
-      COMMENT_TITLE: "Translation ratio changes"
    steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-      - name: Read and format locales metadata
-        env:
-          BASE: ${{ github.event.pull_request.base.sha }}
-          HEAD: ${{ github.event.pull_request.head.sha }}
-        run: |
-          LANS=($(git diff $BASE...$HEAD -- newIDE/app/src/locales/LocalesMetadata.js | grep -E "^\s+\"languageName" | sed -E "s/^ *\"languageName\": \"//g" | sed -E "s/\",//g" | sed -E "s/ /_/g"))
-          ADDS=($(git diff $BASE...$HEAD -- newIDE/app/src/locales/LocalesMetadata.js | grep -E "^\+\s*\"translationRatio\"" | sed -E "s/^\+ *\"translationRatio\": //g"))
-          SUBS=($(git diff $BASE...$HEAD -- newIDE/app/src/locales/LocalesMetadata.js | grep -E "^\-\s*\"translationRatio\"" | sed -E "s/^\- *\"translationRatio\": //g"))
-          touch sumup.md
-          echo "## $COMMENT_TITLE" >> sumup.md
-          echo "" >> sumup.md
-          echo "| Language | Change |" >> sumup.md
-          echo "| --- | --- |" >> sumup.md
-          for index in ${!ADDS[@]}; do
-            DELTA=$(echo "scale=3; (${ADDS[index]} - ${SUBS[index]})*100/1" | bc)
-            if (( $(echo "$DELTA == 0" | bc -l) )); then
-              continue
-            fi
-            LANGUAGE=${LANS[index]//_/ }
-            echo "| $LANGUAGE | $(printf "%1.3f" $DELTA) % |" >> sumup.md
-          done
-      - name: Find Comment
-        uses: peter-evans/find-comment@v2
-        id: fc
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          issue-number: ${{ github.event.number }}
-          body-includes: ${{ env.COMMENT_TITLE }}
-      - name: Autocomment pull request with sumup
-        uses: peter-evans/create-or-update-comment@v3
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          issue-number: ${{ github.event.number }}
-          comment-id: ${{ steps.fc.outputs.comment-id }}
-          edit-mode: replace
-          body-path: "sumup.md"
+    - name: Read and format locales metadata
+      run: |
+        LANS=($(git diff HEAD^ HEAD --unified=5 newIDE/app/src/locales/LocalesMetadata.js | tail +6 | grep -E "^\s+\"languageName" | sed -E "s/^ *\"languageName\": \"//g" | sed -E "s/\",//g" | sed -E "s/ /_/g"))
+        ADDS=($(git diff HEAD^ HEAD --unified=0 newIDE/app/src/locales/LocalesMetadata.js | tail +6 | grep -E "^\+\s*\"translationRatio\"" | sed -E "s/^\+ *\"translationRatio\": //g"))
+        SUBS=($(git diff HEAD^ HEAD --unified=0 newIDE/app/src/locales/LocalesMetadata.js | tail +6 | grep -E "^\-\s*\"translationRatio\"" | sed -E "s/^\- *\"translationRatio\": //g"))
+        touch sumup.txt
+        for index in ${!ADDS[@]}; do
+          echo ${LANS[index]} | sed -E "s/_/ /g" >> sumup.txt
+          DELTA=$(bc <<< "scale=2;(${ADDS[index]}-${SUBS[index]})*100/1")
+          echo $DELTA % >> sumup.txt
+        done
+    - name: Store sumup in outputs
+      id: sumup
+      run: echo "::set-output name=sumupFileContent::$(cat sumup.txt)"
+    - name: Autocomment pull request with sumup
+      uses: peter-evans/create-or-update-comment@v1
+      with:
+        issue-number: ${{ github.event.number }}
+        body: ${{ steps.sumup.outputs.sumupFileContent}}
+        token: ${{ secrets.GITHUB_TOKEN }}
--- a/.github/workflows/update-translations.yml
+++ b/.github/workflows/update-translations.yml
@@ -7,8 +7,6 @@ on:
  push:
    branches:
      - master
-    tags-ignore:
-      - "**" # Don't run on new tags
  # Allows to run this workflow manually from the Actions tab.
  workflow_dispatch:

@@ -16,12 +14,17 @@ jobs:
  update-translations:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v2
+
+      # Cache npm dependencies to speed up the workflow
+      - name: Cache node modules
+        uses: actions/cache@v2
+        env:
+          cache-name: cache-newIDE-app-node_modules
        with:
-          node-version: 16
-          cache: "npm"
-          cache-dependency-path: "newIDE/app/package-lock.json"
+          # npm cache files are stored in `~/.npm` on Linux/macOS
+          path: ~/.npm
+          key: ${{ runner.os }}-${{ env.cache-name }}-${{ hashFiles('newIDE/app/package-lock.json') }}

      - name: Install gettext
        run: sudo apt update && sudo apt install gettext -y
@@ -41,7 +44,7 @@ jobs:
      # (Build and) download the most recent translations (PO files) from Crowdin.
      - name: Install Crowdin CLI
        run: npm i -g @crowdin/cli
-
+        
      - name: Download new translations from Crowdin
        run: crowdin download
        env:
@@ -58,13 +61,13 @@ jobs:
        working-directory: newIDE/app

      - name: Create a Pull Request with the changes
-        uses: peter-evans/create-pull-request@v5
+        uses: peter-evans/create-pull-request@v3.10.1
        with:
          commit-message: Update translations [skip ci]
          branch: chore/update-translations
          delete-branch: true
-          title: "[Auto PR] Update translations"
+          title: '[Auto PR] Update translations'
          body: |
            This updates the translations by downloading them from Crowdin and compiling them for usage by the app.
-
+            
            Please double check the values in `newIDE/app/src/locales/LocalesMetadata.js` to ensure the changes are sensible.
--- a/.gitignore
+++ b/.gitignore
@@ -8,7 +8,6 @@
 /Binaries/.embuild*
 /Binaries/build*
 /Binaries/embuild*
-/emsdk
 *.dll
 *.exe
 *.a
--- a/.gitpod.yml
+++ b/.gitpod.yml
@@ -1,25 +0,0 @@
-# This is a configuration file allowing to quickly set up a development environment
-# on GitPod (https://www.gitpod.io/).
-# Also check GitHub codespaces if you're interested in working 
-# on a remote development server.
-
-# This works well for:
-# - The editor web-app, including the C++ classes.
-# This is not yet adapted for:
-# - Working on the game engine or extensions, as they can't be easily tested on the web-app.
-# - Working on the desktop app (Electron).
-
-tasks:
-  - name: Install dependencies for Emscripten and build GDevelop.js
-    init: |
-          sudo apt-get update 
-          sudo apt install cmake python-is-python3 python3-distutils -y
-          git clone https://github.com/juj/emsdk.git && cd emsdk && ./emsdk install 3.1.21 && ./emsdk activate 3.1.21 && cd ..
-          cd GDevelop.js
-          npm install
-          source ../emsdk/emsdk_env.sh && npm run build -- --dev
-          cd ..
-  - name: Install GDevelop IDE dependencies
-    init: cd newIDE/app && npm install && cd ../electron-app && npm install
-
-
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,9 @@
 # Travis CI configuration to build and run all tests
 # (and typing/formatting) for the Core, newIDE, GDJS.
 #
+# This builds GDevelop.js and store it on a S3 so it can be used to run
+# GDevelop without building it.
+#
 # See also Semaphore CI for quick tests (not building GDevelop.js, so
 # faster but not always reliable).

@@ -14,7 +17,18 @@ cache:
  directories:
    - $HOME/.npm

+services:
+  # Virtual Framebuffer 'fake' X server for SFML
+  - xvfb
+
 addons:
+  artifacts:
+    s3_region: "us-east-1"
+    target_paths:
+    - /$(if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then echo $TRAVIS_BRANCH; else echo $TRAVIS_PULL_REQUEST_BRANCH; fi)/commit/$(git rev-parse HEAD)
+    - /$(if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then echo $TRAVIS_BRANCH; else echo $TRAVIS_PULL_REQUEST_BRANCH; fi)/latest
+    paths:
+    - Binaries/embuild/GDevelop.js
  apt:
    sources:
    - ubuntu-toolchain-r-test
@@ -22,8 +36,20 @@ addons:
    # Build dependencies:
    - cmake
    - p7zip-full
+    # SFML dependencies:
+    - libopenal-dev
+    - libjpeg-dev
+    - libglew-dev
+    - libudev-dev
+    - libxrandr-dev
+    - libsndfile1-dev
+    - libglu1-mesa-dev
+    - libfreetype6-dev

 before_install:
+  #Activate X Virtual Framebuffer to allow tests to
+  #use SFML.
+  - "export DISPLAY=:99.0"
  # This workaround is required to avoid libstdc++ errors (Emscripten requires a recent version of libstdc++)
  - wget -q -O libstdc++6 http://security.ubuntu.com/ubuntu/pool/main/g/gcc-5/libstdc++6_5.4.0-6ubuntu1~16.04.12_amd64.deb
  - sudo dpkg --force-all -i libstdc++6
@@ -39,7 +65,7 @@ install:
  - cd ..
 # Install Emscripten (for GDevelop.js)
  - git clone https://github.com/juj/emsdk.git
-  - cd emsdk && ./emsdk install 3.1.21 && ./emsdk activate 3.1.21 && cd ..
+  - cd emsdk && ./emsdk install 1.39.6 && ./emsdk activate 1.39.6 && cd ..
 # Install GDevelop.js dependencies
  - cd GDevelop.js && npm install && cd ..
 # Build GDevelop.js
--- a/.vscode/c_cpp_properties.json
+++ b/.vscode/c_cpp_properties.json
@@ -7,9 +7,11 @@
                "${workspaceRoot}/GDJS",
                "${workspaceRoot}/Extensions",
                "${workspaceRoot}/Core",
+                "${workspaceRoot}/ExtLibs/SFML/include",
                "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1",
                "/usr/local/include",
                "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include",
+                "/usr/include",
                "${workspaceRoot}"
            ],
            "defines": [
@@ -25,6 +27,7 @@
                    "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1",
                    "/usr/local/include",
                    "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include",
+                    "/usr/include",
                    "${workspaceRoot}"
                ],
                "limitSymbolsToIncludedHeaders": true,
@@ -45,6 +48,7 @@
                "${workspaceRoot}/GDJS",
                "${workspaceRoot}/Extensions",
                "${workspaceRoot}/Core",
+                "${workspaceRoot}/ExtLibs/SFML/include",
                "/usr/include",
                "/usr/local/include",
                "${workspaceRoot}"
@@ -74,6 +78,7 @@
                "${workspaceRoot}/GDJS",
                "${workspaceRoot}/Extensions",
                "${workspaceRoot}/Core",
+                "${workspaceRoot}/ExtLibs/SFML/include",
                "${workspaceRoot}"
            ],
            "defines": [
@@ -96,4 +101,4 @@
        }
    ],
    "version": 4
-}
+}
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -15,20 +15,6 @@
      "disableOptimisticBPs": true,
      "cwd": "${workspaceFolder}/GDevelop.js"
    },
-    {
-      "type": "node",
-      "request": "launch",
-      "name": "newIDE/app Jest tests (current file)",
-      "program": "${workspaceFolder}/newIDE/app/node_modules/.bin/react-scripts",
-      "args": [
-        "test", "--env=node",
-        "${fileBasenameNoExtension}"
-      ],
-      "console": "integratedTerminal",
-      "internalConsoleOptions": "neverOpen",
-      "disableOptimisticBPs": true,
-      "cwd": "${workspaceFolder}/newIDE/app"
-    },
    {
      "type": "node",
      "request": "launch",
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,135 +1,132 @@
 // Place your settings in this file to overwrite default and user settings.
 {
-  "files.associations": {
-    "*.idl": "java",
-    "Fastfile": "ruby",
-    "iosfwd": "cpp",
-    "functional": "cpp",
-    "type_traits": "cpp",
-    "utility": "cpp",
-    "algorithm": "cpp",
-    "random": "cpp",
-    "__config": "cpp",
-    "cstddef": "cpp",
-    "exception": "cpp",
-    "initializer_list": "cpp",
-    "new": "cpp",
-    "stdexcept": "cpp",
-    "typeinfo": "cpp",
-    "*.tcc": "cpp",
-    "cctype": "cpp",
-    "clocale": "cpp",
-    "cmath": "cpp",
-    "complex": "cpp",
-    "cstdarg": "cpp",
-    "cstdio": "cpp",
-    "cstdlib": "cpp",
-    "ctime": "cpp",
-    "cwchar": "cpp",
-    "cwctype": "cpp",
-    "istream": "cpp",
-    "limits": "cpp",
-    "memory": "cpp",
-    "ostream": "cpp",
-    "sstream": "cpp",
-    "streambuf": "cpp",
-    "hashtable": "cpp",
-    "tuple": "cpp",
-    "unordered_map": "cpp",
-    "unordered_set": "cpp",
-    "__split_buffer": "cpp",
-    "deque": "cpp",
-    "iterator": "cpp",
-    "list": "cpp",
-    "map": "cpp",
-    "queue": "cpp",
-    "regex": "cpp",
-    "set": "cpp",
-    "stack": "cpp",
-    "string": "cpp",
-    "vector": "cpp",
-    "iostream": "cpp",
-    "__functional_03": "cpp",
-    "__hash_table": "cpp",
-    "__tree": "cpp",
-    "bitset": "cpp",
-    "__bit_reference": "cpp",
-    "__mutex_base": "cpp",
-    "fstream": "cpp",
-    "ios": "cpp",
-    "__locale": "cpp",
-    "valarray": "cpp",
-    "freeglut_spaceball.c": "cpp",
-    "__tuple": "cpp",
-    "hash_map": "cpp",
-    "hash_set": "cpp",
-    "system_error": "cpp",
-    "__nullptr": "cpp",
-    "__functional_base": "cpp",
-    "__functional_base_03": "cpp",
-    "chrono": "cpp",
-    "ratio": "cpp",
-    "atomic": "cpp",
-    "locale": "cpp",
-    "string_view": "cpp",
-    "__string": "cpp",
-    "cstring": "cpp",
-    "iomanip": "cpp",
-    "cstdint": "cpp",
-    "forward_list": "cpp",
-    "mutex": "cpp",
-    "__hash": "cpp",
-    "__debug": "cpp",
-    "__threading_support": "cpp",
-    "any": "cpp",
-    "array": "cpp",
-    "cinttypes": "cpp",
-    "numeric": "cpp",
-    "__memory": "cpp",
-    "__errc": "cpp",
-    "__node_handle": "cpp",
-    "bit": "cpp",
-    "optional": "cpp",
-    "filesystem": "cpp",
-    "compare": "cpp",
-    "concepts": "cpp",
-    "xfacet": "cpp",
-    "xhash": "cpp",
-    "xiosbase": "cpp",
-    "xlocale": "cpp",
-    "xlocinfo": "cpp",
-    "xlocmon": "cpp",
-    "xlocnum": "cpp",
-    "xloctime": "cpp",
-    "xmemory": "cpp",
-    "xstddef": "cpp",
-    "xstring": "cpp",
-    "xtr1common": "cpp",
-    "xtree": "cpp",
-    "xutility": "cpp",
-    "xlocbuf": "cpp",
-    "xlocmes": "cpp",
-    "xmemory0": "cpp",
-    "memory_resource": "cpp",
-    "__bits": "cpp",
-    "__verbose_abort": "cpp",
-    "variant": "cpp",
-    "charconv": "cpp"
-  },
-  "files.exclude": {
-    "Binaries/*build*": true,
-    "Binaries/Output": true,
-    "GDJS/Runtime-dist": true,
-    "docs": true,
-    "newIDE/electron-app/dist": true,
-    "newIDE/app/build": true,
-    "newIDE/app/resources/GDJS": true,
-    "newIDE/electron-app/app/www": true
-  },
-  // Support for Flowtype (for newIDE):
-  "javascript.validate.enable": false,
-  "flow.useNPMPackagedFlow": true,
+    "files.associations": {
+        "*.idl": "java",
+        "Fastfile": "ruby",
+        "iosfwd": "cpp",
+        "functional": "cpp",
+        "type_traits": "cpp",
+        "utility": "cpp",
+        "algorithm": "cpp",
+        "random": "cpp",
+        "__config": "cpp",
+        "cstddef": "cpp",
+        "exception": "cpp",
+        "initializer_list": "cpp",
+        "new": "cpp",
+        "stdexcept": "cpp",
+        "typeinfo": "cpp",
+        "*.tcc": "cpp",
+        "cctype": "cpp",
+        "clocale": "cpp",
+        "cmath": "cpp",
+        "complex": "cpp",
+        "cstdarg": "cpp",
+        "cstdio": "cpp",
+        "cstdlib": "cpp",
+        "ctime": "cpp",
+        "cwchar": "cpp",
+        "cwctype": "cpp",
+        "istream": "cpp",
+        "limits": "cpp",
+        "memory": "cpp",
+        "ostream": "cpp",
+        "sstream": "cpp",
+        "streambuf": "cpp",
+        "hashtable": "cpp",
+        "tuple": "cpp",
+        "unordered_map": "cpp",
+        "unordered_set": "cpp",
+        "__split_buffer": "cpp",
+        "deque": "cpp",
+        "iterator": "cpp",
+        "list": "cpp",
+        "map": "cpp",
+        "queue": "cpp",
+        "regex": "cpp",
+        "set": "cpp",
+        "stack": "cpp",
+        "string": "cpp",
+        "vector": "cpp",
+        "iostream": "cpp",
+        "__functional_03": "cpp",
+        "__hash_table": "cpp",
+        "__tree": "cpp",
+        "bitset": "cpp",
+        "__bit_reference": "cpp",
+        "__mutex_base": "cpp",
+        "fstream": "cpp",
+        "ios": "cpp",
+        "__locale": "cpp",
+        "valarray": "cpp",
+        "freeglut_spaceball.c": "cpp",
+        "__tuple": "cpp",
+        "hash_map": "cpp",
+        "hash_set": "cpp",
+        "system_error": "cpp",
+        "__nullptr": "cpp",
+        "__functional_base": "cpp",
+        "__functional_base_03": "cpp",
+        "chrono": "cpp",
+        "ratio": "cpp",
+        "atomic": "cpp",
+        "locale": "cpp",
+        "string_view": "cpp",
+        "__string": "cpp",
+        "cstring": "cpp",
+        "iomanip": "cpp",
+        "cstdint": "cpp",
+        "forward_list": "cpp",
+        "mutex": "cpp",
+        "__hash": "cpp",
+        "__debug": "cpp",
+        "__threading_support": "cpp",
+        "any": "cpp",
+        "array": "cpp",
+        "cinttypes": "cpp",
+        "numeric": "cpp",
+        "__memory": "cpp",
+        "__errc": "cpp",
+        "__node_handle": "cpp",
+        "bit": "cpp",
+        "optional": "cpp",
+        "filesystem": "cpp",
+        "compare": "cpp",
+        "concepts": "cpp",
+        "xfacet": "cpp",
+        "xhash": "cpp",
+        "xiosbase": "cpp",
+        "xlocale": "cpp",
+        "xlocinfo": "cpp",
+        "xlocmon": "cpp",
+        "xlocnum": "cpp",
+        "xloctime": "cpp",
+        "xmemory": "cpp",
+        "xstddef": "cpp",
+        "xstring": "cpp",
+        "xtr1common": "cpp",
+        "xtree": "cpp",
+        "xutility": "cpp",
+        "xlocbuf": "cpp",
+        "xlocmes": "cpp",
+        "xmemory0": "cpp",
+        "memory_resource": "cpp"
+    },
+    "files.exclude": {
+        "Binaries/*build*": true,
+        "Binaries/Output": true,
+        "ExtLibs/SFML": true,
+        "GDJS/Runtime-dist": true,
+        "docs": true,
+        "newIDE/electron-app/dist": true,
+        "newIDE/app/build": true,
+        "newIDE/app/resources/GDJS": true,
+        "newIDE/electron-app/app/www": true
+    },
+    // Support for Flowtype (for newIDE):
+    "javascript.validate.enable": false,
+    "flow.useNPMPackagedFlow": true,

-  // Clang format styling (duplicated in scripts/CMakeClangUtils.txt)
-  "C_Cpp.clang_format_style": "{BasedOnStyle: Google, BinPackParameters: false, BinPackArguments: false}"
+    // Clang format styling (duplicated in scripts/CMakeClangUtils.txt)
+    "C_Cpp.clang_format_style": "{BasedOnStyle: Google, BinPackParameters: false, BinPackArguments: false}"
 }
--- a/Binaries/README.md
+++ b/Binaries/README.md
@@ -1,3 +1,3 @@
 This is the directory where native or WebAssembly binaries of the C++ code of GDCore and GDJS are produced.

-See GDevelop.js README for the instructions to compile after a change in the C++ source code.
+See GDevelop.js README for the instructions to compile after a change in the C++ source code.
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,100 +1,100 @@
-# This is the CMake file used to build GDevelop.
-# For more information, see the README.md file.
+#This is the CMake file used to build GDevelop.
+#For more information, see the Readme.md file.

-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 2.6)
+cmake_policy(SET CMP0011 NEW)

 # Add utility functions
 include(scripts/CMakeClangUtils.txt) # To add clang-format and clang-tidy support to a target

 # Macro for defining an option
 macro(gd_set_option var default type docstring)
-	if(NOT DEFINED ${var})
-		set(${var} ${default})
-	endif()
-	set(${var} ${${var}} CACHE ${type} ${docstring} FORCE)
+    if(NOT DEFINED ${var})
+        set(${var} ${default})
+    endif()
+    set(${var} ${${var}} CACHE ${type} ${docstring} FORCE)
 endmacro()
-
-# Set options
 gd_set_option(BUILD_CORE TRUE BOOL "TRUE to build GDevelop Core library")
 gd_set_option(BUILD_GDJS TRUE BOOL "TRUE to build GDevelop JS Platform")
 gd_set_option(BUILD_EXTENSIONS TRUE BOOL "TRUE to build the extensions")
-gd_set_option(BUILD_TESTS TRUE BOOL "TRUE to build the tests")
+gd_set_option(BUILD_TESTS FALSE BOOL "TRUE to build the tests")

 # Disable deprecated code
-set(NO_GUI TRUE CACHE BOOL "" FORCE) # Force disable old GUI related code.
+set(NO_GUI TRUE CACHE BOOL "" FORCE) #Force disable old GUI related code.

-# Setting up installation directory, for Linux (has to be done before "project" command).
-if(NOT WIN32)
-	if(NOT APPLE)
-		gd_set_option(GD_INSTALL_PREFIX "/opt/gdevelop/" STRING "The directory where GDevelop should be installed")
-	else()
-		gd_set_option(GD_INSTALL_PREFIX "." STRING "The directory where GDevelop should be installed")
-	endif()
+#Setting up installation directory, for Linux (has to be done before "project" command).
+IF(NOT WIN32)
+	if (NOT APPLE)
+	gd_set_option(GD_INSTALL_PREFIX "/opt/gdevelop/" STRING "The directory where GDevelop should be installed")
+	ELSE()
+	gd_set_option(GD_INSTALL_PREFIX "." STRING "The directory where GDevelop should be installed")
+	ENDIF()

-	# As we embed SFML, prevent it to be installed system-wide
+	#As we embed SFML, prevent it to be installed system-wide
 	set(CMAKE_INSTALL_PREFIX "${GD_INSTALL_PREFIX}/useless")
-endif()
+ENDIF()

 project(GDevelop)
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
-if(NOT WIN32 AND NOT APPLE AND NOT BUILD_TESTS)
-	set(CMAKE_SKIP_BUILD_RPATH TRUE) # Avoid errors when packaging for linux.
-endif()
-if(APPLE)
+IF(NOT WIN32 AND NOT APPLE AND NOT BUILD_TESTS)
+	SET(CMAKE_SKIP_BUILD_RPATH  TRUE) #Avoid errors when packaging for linux.
+ENDIF()
+IF(APPLE)
 	set(CMAKE_MACOSX_RPATH 1)
 	set(CMAKE_INSTALL_RPATH_USE_LINK_PATH FALSE)
 	set(CMAKE_INSTALL_RPATH ".")
 	set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
-	add_compile_options(
-		-D_WCHAR_H_CPLUSPLUS_98_CONFORMANCE_
-		-Wno-potentially-evaluated-expression)
-endif()
-# Sanity checks
-if("${CMAKE_BUILD_TYPE}" STREQUAL "")
-	message(STATUS "CMAKE_BUILD_TYPE is empty, assuming build type is Release")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_WCHAR_H_CPLUSPLUS_98_CONFORMANCE_")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-potentially-evaluated-expression")
+ENDIF()
+#Sanity checks
+IF ("${CMAKE_BUILD_TYPE}" STREQUAL "")
+	message( "CMAKE_BUILD_TYPE is empty, assuming build type is Release" )
 	set(CMAKE_BUILD_TYPE Release)
-endif()
+ENDIF()

-if("${CMAKE_BUILD_TYPE}" STREQUAL "Release" AND NOT WIN32 AND CMAKE_COMPILER_IS_GNUCXX)
-	set(CMAKE_SHARED_LINKER_FLAGS "-s") # Force stripping to avoid errors when packaging for linux.
-endif()
+IF("${CMAKE_BUILD_TYPE}" STREQUAL "Release" AND NOT WIN32 AND CMAKE_COMPILER_IS_GNUCXX)
+	SET(CMAKE_SHARED_LINKER_FLAGS "-s") #Force stripping to avoid errors when packaging for linux.
+ENDIF()

 #Activate C++11
-set(CMAKE_CXX_STANDARD 11) # Upgrading to C++17 would need to remove usage of bind2nd (should be easy).
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
+include(CheckCXXCompilerFlag)
+CHECK_CXX_COMPILER_FLAG("-std=gnu++11" COMPILER_SUPPORTS_CXX11)
+CHECK_CXX_COMPILER_FLAG("-std=gnu++0x" COMPILER_SUPPORTS_CXX0X)
+if(COMPILER_SUPPORTS_CXX11)
+       set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11")
+elseif(COMPILER_SUPPORTS_CXX0X)
+       set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++0x")
+else()
+    message(FATAL_ERROR "The compiler ${CMAKE_CXX_COMPILER} has no C++11 support (with GNU extensions). Please use a different C++ compiler.")
+endif()

 # Mark some warnings as errors
 if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
 	# Activate as much warnings as possible to avoid errors like
 	# uninitialized variables or other hard to debug bugs.
-	add_compile_options(
-		-Wall
-		-Wno-unknown-warning-option
-		-Wno-reorder-ctor
-		-Wno-reorder
-		-Wno-pessimizing-move
-		-Wno-unused-variable
-		-Wno-unused-private-field
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unknown-warning-option")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-reorder-ctor -Wno-reorder -Wno-pessimizing-move -Wno-unused-variable -Wno-unused-private-field")

-		# Make as much warnings considered as errors as possible (only one for now).
-		-Werror=return-stack-address
-		-Werror=return-type)
+	# Make as much warnings considered as errors as possible (only one for now).
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror=return-stack-address")
 endif()

-# Define common directories:
+#Define common directories:
 set(GD_base_dir ${CMAKE_CURRENT_SOURCE_DIR})

-# Add all the CMakeLists:
-add_subdirectory(ExtLibs)
-if(BUILD_CORE)
-	add_subdirectory(Core)
-endif()
-if(BUILD_GDJS)
-	add_subdirectory(GDJS)
-endif()
-if(EMSCRIPTEN)
-	add_subdirectory(GDevelop.js)
-endif()
-if(BUILD_EXTENSIONS)
-	add_subdirectory(Extensions)
-endif()
+#Add all the CMakeLists:
+ADD_SUBDIRECTORY(ExtLibs)
+IF(BUILD_CORE)
+	ADD_SUBDIRECTORY(Core)
+ENDIF()
+IF(BUILD_GDJS)
+	ADD_SUBDIRECTORY(GDJS)
+ENDIF()
+IF(EMSCRIPTEN)
+	ADD_SUBDIRECTORY(GDevelop.js)
+ENDIF()
+IF(BUILD_EXTENSIONS)
+	ADD_SUBDIRECTORY(Extensions)
+ENDIF()
--- a/Core/CMakeLists.txt
+++ b/Core/CMakeLists.txt
@@ -1,98 +1,92 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 2.6)
+cmake_policy(SET CMP0015 NEW)

 project(GDCore)

-set(CMAKE_C_USE_RESPONSE_FILE_FOR_OBJECTS 1) # Force use response file: useful for Ninja build system on Windows.
-set(CMAKE_CXX_USE_RESPONSE_FILE_FOR_OBJECTS 1)
-set(CMAKE_C_USE_RESPONSE_FILE_FOR_INCLUDES 1)
-set(CMAKE_CXX_USE_RESPONSE_FILE_FOR_INCLUDES 1)
+SET(CMAKE_C_USE_RESPONSE_FILE_FOR_OBJECTS 1) #Force use response file: useful for Ninja build system on Windows.
+SET(CMAKE_CXX_USE_RESPONSE_FILE_FOR_OBJECTS 1)
+SET(CMAKE_C_USE_RESPONSE_FILE_FOR_INCLUDES 1)
+SET(CMAKE_CXX_USE_RESPONSE_FILE_FOR_INCLUDES 1)

-# Define common directories:
+#Define common directories:
 set(GDCORE_include_dir ${GD_base_dir}/Core PARENT_SCOPE)
 set(GDCORE_lib_dir ${GD_base_dir}/Binaries/Output/${CMAKE_BUILD_TYPE}_${CMAKE_SYSTEM_NAME} PARENT_SCOPE)

-# Dependencies on external libraries:
-#
+#Dependencies on external libraries:
+###
+include_directories(${sfml_include_dir})

-# Defines
-#
-add_definitions(-DGD_IDE_ONLY)
-if(EMSCRIPTEN)
-	add_definitions(-DEMSCRIPTEN)
-endif()
-if("${CMAKE_BUILD_TYPE}" MATCHES "Debug")
-	add_definitions(-DDEBUG)
-else()
-	add_definitions(-DRELEASE)
-endif()
+#Defines
+###
+add_definitions( -DGD_IDE_ONLY )
+IF (EMSCRIPTEN)
+	add_definitions( -DEMSCRIPTEN )
+ENDIF()
+IF(CMAKE_BUILD_TYPE MATCHES "Debug")
+	add_definitions( -DDEBUG )
+ELSE()
+	add_definitions( -DRELEASE )
+ENDIF()

-if(WIN32)
-	add_definitions(-DWINDOWS)
-	add_definitions("-DGD_CORE_API=__declspec(dllexport)")
-	add_definitions(-D__GNUWIN32__)
-else()
-	if(APPLE)
-		add_definitions(-DMACOS)
-	else()
-		add_definitions(-DLINUX)
-	endif()
-	add_definitions(-DGD_API=)
-	add_definitions(-DGD_CORE_API=)
-endif()
+IF(WIN32)
+	add_definitions( -DWINDOWS )
+	add_definitions( "-DGD_CORE_API=__declspec(dllexport)" )
+	add_definitions( -D__GNUWIN32__ )
+ELSE()
+    IF(APPLE)
+    add_definitions( -DMACOS )
+    ELSE()
+	add_definitions( -DLINUX )
+	ENDIF()
+	add_definitions( -DGD_API= )
+	add_definitions( -DGD_CORE_API= )
+ENDIF(WIN32)

-# The target
-#
+#The target
+###
 include_directories(.)
-file(
-	GLOB_RECURSE
-	source_files
-	GDCore/*)
+file(GLOB_RECURSE source_files GDCore/*)

-file(
-	GLOB_RECURSE
-	formatted_source_files
-	tests/*
-	GDCore/Events/*
-	GDCore/Extensions/*
-	GDCore/IDE/*
-	GDCore/Project/*
-	GDCore/Serialization/*
-	GDCore/Tools/*)
-list(
-	REMOVE_ITEM
-	formatted_source_files
-	"${CMAKE_CURRENT_SOURCE_DIR}/GDCore/IDE/Dialogs/GDCoreDialogs.cpp"
-	"${CMAKE_CURRENT_SOURCE_DIR}/GDCore/IDE/Dialogs/GDCoreDialogs.h"
-	"${CMAKE_CURRENT_SOURCE_DIR}/GDCore/IDE/Dialogs/GDCoreDialogs_dialogs_bitmaps.cpp")
+file(GLOB_RECURSE formatted_source_files tests/* GDCore/Events/* GDCore/Extensions/* GDCore/IDE/* GDCore/Project/* GDCore/Serialization/* GDCore/Tools/*)
+list(REMOVE_ITEM formatted_source_files "${CMAKE_CURRENT_SOURCE_DIR}/GDCore/IDE/Dialogs/GDCoreDialogs.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/GDCore/IDE/Dialogs/GDCoreDialogs.h" "${CMAKE_CURRENT_SOURCE_DIR}/GDCore/IDE/Dialogs/GDCoreDialogs_dialogs_bitmaps.cpp")
 gd_add_clang_utils(GDCore "${formatted_source_files}")

-if(EMSCRIPTEN)
+IF(EMSCRIPTEN)
 	# Emscripten treats all libraries as static libraries
 	add_library(GDCore STATIC ${source_files})
-else()
+ELSE()
 	add_library(GDCore SHARED ${source_files})
-endif()
-if(EMSCRIPTEN)
+ENDIF()
+IF(EMSCRIPTEN)
 	set_target_properties(GDCore PROPERTIES SUFFIX ".bc")
-elseif(WIN32)
+ELSEIF(WIN32)
 	set_target_properties(GDCore PROPERTIES PREFIX "")
-else()
+ELSE()
 	set_target_properties(GDCore PROPERTIES PREFIX "lib")
-endif()
+ENDIF()
 set(LIBRARY_OUTPUT_PATH ${GD_base_dir}/Binaries/Output/${CMAKE_BUILD_TYPE}_${CMAKE_SYSTEM_NAME})
 set(ARCHIVE_OUTPUT_PATH ${GD_base_dir}/Binaries/Output/${CMAKE_BUILD_TYPE}_${CMAKE_SYSTEM_NAME})
 set(RUNTIME_OUTPUT_PATH ${GD_base_dir}/Binaries/Output/${CMAKE_BUILD_TYPE}_${CMAKE_SYSTEM_NAME})

-# Tests
-#
+#Linker files
+###
+IF(EMSCRIPTEN)
+	#Nothing.
+ELSE()
+	target_link_libraries(GDCore ${sfml_LIBRARIES})
+ENDIF()
+
+#Tests
+###
 if(BUILD_TESTS)
 	file(
-		GLOB_RECURSE
-		test_source_files
-		tests/*)
+	    GLOB_RECURSE
+	    test_source_files
+	    tests/*
+	)

 	add_executable(GDCore_tests ${test_source_files})
-	set_target_properties(GDCore_tests PROPERTIES BUILD_WITH_INSTALL_RPATH FALSE) # Allow finding dependencies directly from build path on Mac OS X.
+	set_target_properties(GDCore_tests PROPERTIES BUILD_WITH_INSTALL_RPATH FALSE) #Allow finding dependencies directly from build path on Mac OS X.
 	target_link_libraries(GDCore_tests GDCore)
-	target_link_libraries(GDCore_tests ${CMAKE_DL_LIBS})
+	target_link_libraries(GDCore_tests ${sfml_LIBRARIES})
 endif()
--- a/Core/GDCore/CommonTools.h
+++ b/Core/GDCore/CommonTools.h
@@ -13,6 +13,7 @@
 #include <string>
 #include <vector>
 #include "Utf8/utf8.h"
+#include <SFML/System/String.hpp>

 #ifdef __GNUC__
    #define GD_DEPRECATED    __attribute__((deprecated))
--- a/Core/GDCore/Events/Builtin/AsyncEvent.cpp
+++ b/Core/GDCore/Events/Builtin/AsyncEvent.cpp
@@ -1,36 +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 "AsyncEvent.h"
-#include "GDCore/CommonTools.h"
-#include "GDCore/Events/CodeGeneration/EventsCodeGenerationContext.h"
-#include "GDCore/Events/CodeGeneration/EventsCodeGenerator.h"
-#include "GDCore/Events/Serialization.h"
-#include "GDCore/Serialization/SerializerElement.h"
-
-using namespace std;
-
-namespace gd {
-
-AsyncEvent::AsyncEvent() : BaseEvent() {}
-
-AsyncEvent::~AsyncEvent(){};
-
-vector<const gd::InstructionsList *> AsyncEvent::GetAllActionsVectors() const {
-  vector<const gd::InstructionsList *> allActions;
-  allActions.push_back(&actions);
-
-  return allActions;
-}
-
-vector<gd::InstructionsList *> AsyncEvent::GetAllActionsVectors() {
-  vector<gd::InstructionsList *> allActions;
-  allActions.push_back(&actions);
-
-  return allActions;
-}
-
-} // namespace gd
--- a/Core/GDCore/Events/Builtin/AsyncEvent.h
+++ b/Core/GDCore/Events/Builtin/AsyncEvent.h
@@ -1,61 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-
-#ifndef GDCORE_ASYNCEVENT_H
-#define GDCORE_ASYNCEVENT_H
-#include "GDCore/Events/Event.h"
-#include "GDCore/Events/EventsList.h"
-#include "GDCore/Events/Instruction.h"
-#include "GDCore/Events/InstructionsList.h"
-namespace gd {
-class Instruction;
-class Project;
-} // namespace gd
-
-namespace gd {
-
-/**
- * \brief Internal event for asynchronous actions.
- * This event gets added internally to the events tree when an
- * asynchronous action is used.
- */
-class GD_CORE_API AsyncEvent : public gd::BaseEvent {
-public:
-  AsyncEvent();
-  AsyncEvent(const gd::Instruction &asyncAction_,
-             const gd::InstructionsList &actions_,
-             const gd::EventsList &subEvents_)
-      : asyncAction(asyncAction_), actions(actions_), subEvents(subEvents_) {
-    SetType("BuiltinAsync::Async");
-  };
-  virtual ~AsyncEvent();
-  virtual gd::AsyncEvent *Clone() const { return new AsyncEvent(*this); }
-
-  virtual bool IsExecutable() const { return true; }
-
-  virtual bool CanHaveSubEvents() const { return true; }
-  virtual const gd::EventsList &GetSubEvents() const { return subEvents; };
-  virtual gd::EventsList &GetSubEvents() { return subEvents; };
-
-  const gd::InstructionsList &GetActions() const { return actions; };
-  gd::InstructionsList &GetActions() { return actions; };
-
-  const gd::Instruction &GetInstruction() const { return asyncAction; };
-  gd::Instruction &GetInstruction() { return asyncAction; };
-
-  virtual std::vector<const gd::InstructionsList *>
-  GetAllActionsVectors() const;
-  virtual std::vector<gd::InstructionsList *> GetAllActionsVectors();
-
-private:
-  gd::Instruction asyncAction;
-  gd::InstructionsList actions;
-  EventsList subEvents;
-};
-
-} // namespace gd
-
-#endif // GDCORE_STANDARDEVENT_H
--- a/Core/GDCore/Events/Builtin/CommentEvent.cpp
+++ b/Core/GDCore/Events/Builtin/CommentEvent.cpp
@@ -23,9 +23,8 @@ vector<gd::String> CommentEvent::GetAllSearchableStrings() const {

 bool CommentEvent::ReplaceAllSearchableStrings(
    std::vector<gd::String> newSearchableString) {
-  if (newSearchableString[0] == com1) return false;
  SetComment(newSearchableString[0]);
-  return true;
+  return newSearchableString[0] == com1;
 }

 void CommentEvent::SerializeTo(SerializerElement &element) const {
@@ -38,7 +37,7 @@ void CommentEvent::SerializeTo(SerializerElement &element) const {
      .SetAttribute("textB", textB);

  element.AddChild("comment").SetValue(com1);
-  if (!com2.empty()) element.AddChild("comment2").SetValue(com2);
+  element.AddChild("comment2").SetValue(com2);
 }

 void CommentEvent::UnserializeFrom(gd::Project &project,
@@ -53,9 +52,7 @@ void CommentEvent::UnserializeFrom(gd::Project &project,
  textB = colorElement.GetIntAttribute("textB");

  com1 = element.GetChild("comment", 0, "Com1").GetValue().GetString();
-  if (element.HasChild("comment2")) {
-    com2 = element.GetChild("comment2", 0, "Com2").GetValue().GetString();
-  }
+  com2 = element.GetChild("comment2", 0, "Com2").GetValue().GetString();
 }

 }  // namespace gd
--- a/Core/GDCore/Events/Builtin/ForEachChildVariableEvent.cpp
+++ b/Core/GDCore/Events/Builtin/ForEachChildVariableEvent.cpp
@@ -45,47 +45,16 @@ ForEachChildVariableEvent::GetAllActionsVectors() const {
  return allActions;
 }

-vector<pair<gd::Expression*, gd::ParameterMetadata> >
-    ForEachChildVariableEvent::GetAllExpressionsWithMetadata() {
-  vector<pair<gd::Expression*, gd::ParameterMetadata> >
-      allExpressionsWithMetadata;
-  auto metadata = gd::ParameterMetadata().SetType("scenevar");
-  allExpressionsWithMetadata.push_back(
-      std::make_pair(&iterableVariableName, metadata));
-  allExpressionsWithMetadata.push_back(
-      std::make_pair(&valueIteratorVariableName, metadata));
-  allExpressionsWithMetadata.push_back(
-      std::make_pair(&keyIteratorVariableName, metadata));
-
-  return allExpressionsWithMetadata;
-}
-vector<pair<const gd::Expression*, const gd::ParameterMetadata> >
-    ForEachChildVariableEvent::GetAllExpressionsWithMetadata() const {
-  vector<pair<const gd::Expression*, const gd::ParameterMetadata> >
-      allExpressionsWithMetadata;
-  auto metadata = gd::ParameterMetadata().SetType("scenevar");
-  allExpressionsWithMetadata.push_back(
-      std::make_pair(&iterableVariableName, metadata));
-  allExpressionsWithMetadata.push_back(
-      std::make_pair(&valueIteratorVariableName, metadata));
-  allExpressionsWithMetadata.push_back(
-      std::make_pair(&keyIteratorVariableName, metadata));
-
-  return allExpressionsWithMetadata;
-}
-
 void ForEachChildVariableEvent::SerializeTo(SerializerElement& element) const {
-  element.AddChild("iterableVariableName").SetValue(iterableVariableName.GetPlainString());
-  element.AddChild("valueIteratorVariableName").SetValue(valueIteratorVariableName.GetPlainString());
-  element.AddChild("keyIteratorVariableName").SetValue(keyIteratorVariableName.GetPlainString());
+  element.AddChild("iterableVariableName").SetValue(iterableVariableName);
+  element.AddChild("valueIteratorVariableName").SetValue(valueIteratorVariableName);
+  element.AddChild("keyIteratorVariableName").SetValue(keyIteratorVariableName);
  gd::EventsListSerialization::SerializeInstructionsTo(
      conditions, element.AddChild("conditions"));
  gd::EventsListSerialization::SerializeInstructionsTo(
      actions, element.AddChild("actions"));
-
-  if (!events.IsEmpty())
-    gd::EventsListSerialization::SerializeEventsTo(events,
-                                                  element.AddChild("events"));
+  gd::EventsListSerialization::SerializeEventsTo(events,
+                                                 element.AddChild("events"));
 }

 void ForEachChildVariableEvent::UnserializeFrom(gd::Project& project,
@@ -97,12 +66,8 @@ void ForEachChildVariableEvent::UnserializeFrom(gd::Project& project,
      project, conditions, element.GetChild("conditions", 0, "Conditions"));
  gd::EventsListSerialization::UnserializeInstructionsFrom(
      project, actions, element.GetChild("actions", 0, "Actions"));
-
-  events.Clear();
-  if (element.HasChild("events", "Events")) {
-    gd::EventsListSerialization::UnserializeEventsFrom(
-        project, events, element.GetChild("events", 0, "Events"));
-  }
+  gd::EventsListSerialization::UnserializeEventsFrom(
+      project, events, element.GetChild("events", 0, "Events"));
 }

 }  // namespace gd
--- a/Core/GDCore/Events/Builtin/ForEachChildVariableEvent.h
+++ b/Core/GDCore/Events/Builtin/ForEachChildVariableEvent.h
@@ -8,7 +8,6 @@
 #define FOREACHCHILDVARIABLEEVENT_H
 #include "GDCore/Events/Event.h"
 #include "GDCore/Events/EventsList.h"
-#include "GDCore/Events/Expression.h"
 namespace gd {
 class Instruction;
 class Project;
@@ -45,7 +44,7 @@ class GD_CORE_API ForEachChildVariableEvent : public gd::BaseEvent {
   *
   * It is the structure variable that will be iterated on.
   */
-  const gd::String& GetIterableVariableName() const { return iterableVariableName.GetPlainString(); };
+  const gd::String& GetIterableVariableName() const { return iterableVariableName; };

  /**
   * \brief Set the iterable variable name attached to the event.
@@ -57,15 +56,15 @@ class GD_CORE_API ForEachChildVariableEvent : public gd::BaseEvent {
  /**
   * \brief Get the value iterator variable attached to the event.
   *
-   * It is the variable that will contain the value of the
+   * It is the variable that will contain the value of the 
   * iterable's child being iterated on.
   */
-  const gd::String& GetValueIteratorVariableName() const { return valueIteratorVariableName.GetPlainString(); };
+  const gd::String& GetValueIteratorVariableName() const { return valueIteratorVariableName; };

  /**
   * \brief Set the value iterator variable attached to the event.
   *
-   * It is the variable that will contain the value of the
+   * It is the variable that will contain the value of the 
   * iterable's child being iterated on.
   */
  void SetValueIteratorVariableName(gd::String newName) { valueIteratorVariableName = newName; };
@@ -73,15 +72,15 @@ class GD_CORE_API ForEachChildVariableEvent : public gd::BaseEvent {
  /**
   * \brief Get the key iterator variable attached to the event.
   *
-   * It is the variable that will contain the name of the
+   * It is the variable that will contain the name of the 
   * iterable's child being iterated on.
   */
-  const gd::String& GetKeyIteratorVariableName() const { return keyIteratorVariableName.GetPlainString(); };
+  const gd::String& GetKeyIteratorVariableName() const { return keyIteratorVariableName; };

  /**
   * \brief Set the key iterator variable attached to the event.
   *
-   * It is the variable that will contain the name of the
+   * It is the variable that will contain the name of the 
   * iterable's child being iterated on.
   */
  void SetKeyIteratorVariableName(gd::String newName) { keyIteratorVariableName = newName; };
@@ -93,19 +92,14 @@ class GD_CORE_API ForEachChildVariableEvent : public gd::BaseEvent {
  virtual std::vector<gd::InstructionsList*> GetAllConditionsVectors();
  virtual std::vector<gd::InstructionsList*> GetAllActionsVectors();

-  virtual std::vector<std::pair<const gd::Expression*, const gd::ParameterMetadata> >
-        GetAllExpressionsWithMetadata() const;
-  virtual std::vector<std::pair<gd::Expression*, gd::ParameterMetadata> >
-        GetAllExpressionsWithMetadata();
-
  virtual void SerializeTo(SerializerElement& element) const;
  virtual void UnserializeFrom(gd::Project& project,
                               const SerializerElement& element);

 private:
-  gd::Expression valueIteratorVariableName;
-  gd::Expression keyIteratorVariableName;
-  gd::Expression iterableVariableName;
+  gd::String valueIteratorVariableName;
+  gd::String keyIteratorVariableName;
+  gd::String iterableVariableName;
  gd::InstructionsList conditions;
  gd::InstructionsList actions;
  gd::EventsList events;
--- a/Core/GDCore/Events/Builtin/ForEachEvent.cpp
+++ b/Core/GDCore/Events/Builtin/ForEachEvent.cpp
@@ -15,7 +15,7 @@ using namespace std;
 namespace gd {

 ForEachEvent::ForEachEvent()
-    : BaseEvent(), objectsToPick("") {}
+    : BaseEvent(), objectsToPick(""), objectsToPickSelected(false) {}

 vector<gd::InstructionsList*> ForEachEvent::GetAllConditionsVectors() {
  vector<gd::InstructionsList*> allConditions;
@@ -74,10 +74,8 @@ void ForEachEvent::SerializeTo(SerializerElement& element) const {
      conditions, element.AddChild("conditions"));
  gd::EventsListSerialization::SerializeInstructionsTo(
      actions, element.AddChild("actions"));
-
-  if (!events.IsEmpty())
-    gd::EventsListSerialization::SerializeEventsTo(events,
-                                                  element.AddChild("events"));
+  gd::EventsListSerialization::SerializeEventsTo(events,
+                                                 element.AddChild("events"));
 }

 void ForEachEvent::UnserializeFrom(gd::Project& project,
@@ -88,12 +86,8 @@ void ForEachEvent::UnserializeFrom(gd::Project& project,
      project, conditions, element.GetChild("conditions", 0, "Conditions"));
  gd::EventsListSerialization::UnserializeInstructionsFrom(
      project, actions, element.GetChild("actions", 0, "Actions"));
-
-  events.Clear();
-  if (element.HasChild("events", "Events")) {
-    gd::EventsListSerialization::UnserializeEventsFrom(
-        project, events, element.GetChild("events", 0, "Events"));
-  }
+  gd::EventsListSerialization::UnserializeEventsFrom(
+      project, events, element.GetChild("events", 0, "Events"));
 }

 }  // namespace gd
--- a/Core/GDCore/Events/Builtin/ForEachEvent.h
+++ b/Core/GDCore/Events/Builtin/ForEachEvent.h
@@ -6,8 +6,6 @@

 #ifndef FOREACHEVENT_H
 #define FOREACHEVENT_H
-#include <vector>
-
 #include "GDCore/Events/Event.h"
 #include "GDCore/Events/EventsList.h"
 namespace gd {
@@ -69,6 +67,8 @@ class GD_CORE_API ForEachEvent : public gd::BaseEvent {
  gd::InstructionsList conditions;
  gd::InstructionsList actions;
  gd::EventsList events;
+
+  bool objectsToPickSelected;
 };

 }  // namespace gd
--- a/Core/GDCore/Events/Builtin/GroupEvent.cpp
+++ b/Core/GDCore/Events/Builtin/GroupEvent.cpp
@@ -29,9 +29,8 @@ vector<gd::String> GroupEvent::GetAllSearchableStrings() const {

 bool GroupEvent::ReplaceAllSearchableStrings(
    std::vector<gd::String> newSearchableString) {
-  if (newSearchableString[0] == name) return false;
  SetName(newSearchableString[0]);
-  return true;
+  return newSearchableString[0] == name;
 }

 void GroupEvent::SerializeTo(SerializerElement& element) const {
--- a/Core/GDCore/Events/Builtin/GroupEvent.h
+++ b/Core/GDCore/Events/Builtin/GroupEvent.h
@@ -13,7 +13,6 @@
 namespace gd {
 class Instruction;
 class Project;
-class EventVisitor;
 }
 class EventsCodeGenerationContext;

--- a/Core/GDCore/Events/Builtin/LinkEvent.cpp
+++ b/Core/GDCore/Events/Builtin/LinkEvent.cpp
@@ -16,7 +16,6 @@
 #include "GDCore/Project/Object.h"
 #include "GDCore/Project/Project.h"
 #include "GDCore/Serialization/SerializerElement.h"
-#include "GDCore/Events/EventVisitor.h"

 using namespace std;

@@ -131,46 +130,30 @@ void LinkEvent::SerializeTo(SerializerElement& element) const {

 void LinkEvent::UnserializeFrom(gd::Project& project,
                                const SerializerElement& element) {
+  SerializerElement& includeElement = element.GetChild("include", 0, "Limites");
+
  SetTarget(element.GetChild("target", 0, "Scene").GetValue().GetString());

-  // Compatibility with GD <= 5
-  if (element.HasChild("include", "Limites")) {
-    SerializerElement& includeElement = element.GetChild("include", 0, "Limites");
-    if (includeElement.HasAttribute("includeAll")) {
-      // Compatibility with GDevelop <= 4.0.92
-      if (includeElement.GetBoolAttribute("includeAll", true)) {
-        SetIncludeAllEvents();
-      } else {
-        SetIncludeStartAndEnd(includeElement.GetIntAttribute("start"),
-                              includeElement.GetIntAttribute("end"));
-      }
+  if (includeElement.HasAttribute("includeAll")) {
+    // Compatibility with GDevelop <= 4.0.92
+    if (includeElement.GetBoolAttribute("includeAll", true)) {
+      SetIncludeAllEvents();
    } else {
-      // GDevelop > 4.0.92
-      IncludeConfig config = static_cast<IncludeConfig>(
-          includeElement.GetIntAttribute("includeConfig", 0));
-      if (config == INCLUDE_ALL)
-        SetIncludeAllEvents();
-      else if (config == INCLUDE_EVENTS_GROUP)
-        SetIncludeEventsGroup(includeElement.GetStringAttribute("eventsGroup"));
-      else if (config == INCLUDE_BY_INDEX)
-        SetIncludeStartAndEnd(includeElement.GetIntAttribute("start"),
-                              includeElement.GetIntAttribute("end"));
+      SetIncludeStartAndEnd(includeElement.GetIntAttribute("start"),
+                            includeElement.GetIntAttribute("end"));
    }
  } else {
-    // Since GDevelop 5, links always include all events.
-    SetIncludeAllEvents();
+    // GDevelop > 4.0.92
+    IncludeConfig config = static_cast<IncludeConfig>(
+        includeElement.GetIntAttribute("includeConfig", 0));
+    if (config == INCLUDE_ALL)
+      SetIncludeAllEvents();
+    else if (config == INCLUDE_EVENTS_GROUP)
+      SetIncludeEventsGroup(includeElement.GetStringAttribute("eventsGroup"));
+    else if (config == INCLUDE_BY_INDEX)
+      SetIncludeStartAndEnd(includeElement.GetIntAttribute("start"),
+                            includeElement.GetIntAttribute("end"));
  }
-  // end of compatibility code
-}
-
-bool LinkEvent::AcceptVisitor(gd::EventVisitor &eventVisitor) {
-  return BaseEvent::AcceptVisitor(eventVisitor) ||
-         eventVisitor.VisitLinkEvent(*this);
-}
-
-void LinkEvent::AcceptVisitor(gd::ReadOnlyEventVisitor &eventVisitor) const {
-  BaseEvent::AcceptVisitor(eventVisitor);
-  eventVisitor.VisitLinkEvent(*this);
 }

 }  // namespace gd
--- a/Core/GDCore/Events/Builtin/LinkEvent.h
+++ b/Core/GDCore/Events/Builtin/LinkEvent.h
@@ -30,7 +30,7 @@ class GD_CORE_API LinkEvent : public gd::BaseEvent {
        includeEnd(gd::String::npos),
        linkWasInvalid(false){};
  virtual ~LinkEvent();
-  virtual gd::LinkEvent* Clone() const override { return new LinkEvent(*this); }
+  virtual gd::LinkEvent* Clone() const { return new LinkEvent(*this); }

  /**
   * Get the link target (i.e. the scene or external events the link refers to).
@@ -86,7 +86,7 @@ class GD_CORE_API LinkEvent : public gd::BaseEvent {
  /**
   * The link event must always be preprocessed.
   */
-  virtual bool MustBePreprocessed() override { return true; }
+  virtual bool MustBePreprocessed() { return true; }

  /**
   * \brief Get a pointer to the list of events that are targeted by the link.
@@ -107,14 +107,11 @@ class GD_CORE_API LinkEvent : public gd::BaseEvent {
                                 EventsList& eventList,
                                 std::size_t indexOfTheEventInThisList);

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

-  virtual void SerializeTo(SerializerElement& element) const override;
+  virtual void SerializeTo(SerializerElement& element) const;
  virtual void UnserializeFrom(gd::Project& project,
-                               const SerializerElement& element) override;
-
-  bool AcceptVisitor(gd::EventVisitor& eventVisitor) override;
-  void AcceptVisitor(gd::ReadOnlyEventVisitor& eventVisitor) const override;
+                               const SerializerElement& element);

 private:
  gd::String
--- a/Core/GDCore/Events/Builtin/RepeatEvent.cpp
+++ b/Core/GDCore/Events/Builtin/RepeatEvent.cpp
@@ -35,7 +35,7 @@ vector<pair<gd::Expression*, gd::ParameterMetadata> >
    RepeatEvent::GetAllExpressionsWithMetadata() {
  vector<pair<gd::Expression*, gd::ParameterMetadata> >
      allExpressionsWithMetadata;
-  auto metadata = gd::ParameterMetadata().SetType("number");
+  auto metadata = gd::ParameterMetadata().SetType("expression");
  allExpressionsWithMetadata.push_back(
      std::make_pair(&repeatNumberExpression, metadata));

@@ -61,7 +61,7 @@ vector<pair<const gd::Expression*, const gd::ParameterMetadata> >
    RepeatEvent::GetAllExpressionsWithMetadata() const {
  vector<pair<const gd::Expression*, const gd::ParameterMetadata> >
      allExpressionsWithMetadata;
-  auto metadata = gd::ParameterMetadata().SetType("number");
+  auto metadata = gd::ParameterMetadata().SetType("expression");
  allExpressionsWithMetadata.push_back(
      std::make_pair(&repeatNumberExpression, metadata));

@@ -75,10 +75,8 @@ void RepeatEvent::SerializeTo(SerializerElement& element) const {
      conditions, element.AddChild("conditions"));
  gd::EventsListSerialization::SerializeInstructionsTo(
      actions, element.AddChild("actions"));
-
-  if (!events.IsEmpty())
-    gd::EventsListSerialization::SerializeEventsTo(events,
-                                                  element.AddChild("events"));
+  gd::EventsListSerialization::SerializeEventsTo(events,
+                                                 element.AddChild("events"));
 }

 void RepeatEvent::UnserializeFrom(gd::Project& project,
@@ -91,12 +89,8 @@ void RepeatEvent::UnserializeFrom(gd::Project& project,
      project, conditions, element.GetChild("conditions", 0, "Conditions"));
  gd::EventsListSerialization::UnserializeInstructionsFrom(
      project, actions, element.GetChild("actions", 0, "Actions"));
-
-  events.Clear();
-  if (element.HasChild("events", "Events")) {
-    gd::EventsListSerialization::UnserializeEventsFrom(
-        project, events, element.GetChild("events", 0, "Events"));
-  }
+  gd::EventsListSerialization::UnserializeEventsFrom(
+      project, events, element.GetChild("events", 0, "Events"));
 }

 }  // namespace gd
--- a/Core/GDCore/Events/Builtin/StandardEvent.cpp
+++ b/Core/GDCore/Events/Builtin/StandardEvent.cpp
@@ -53,10 +53,8 @@ void StandardEvent::SerializeTo(SerializerElement& element) const {
      conditions, element.AddChild("conditions"));
  gd::EventsListSerialization::SerializeInstructionsTo(
      actions, element.AddChild("actions"));
-
-  if (!events.IsEmpty())
-    gd::EventsListSerialization::SerializeEventsTo(events,
-                                                  element.AddChild("events"));
+  gd::EventsListSerialization::SerializeEventsTo(events,
+                                                 element.AddChild("events"));
 }

 void StandardEvent::UnserializeFrom(gd::Project& project,
@@ -65,12 +63,8 @@ void StandardEvent::UnserializeFrom(gd::Project& project,
      project, conditions, element.GetChild("conditions", 0, "Conditions"));
  gd::EventsListSerialization::UnserializeInstructionsFrom(
      project, actions, element.GetChild("actions", 0, "Actions"));
-
-  events.Clear();
-  if (element.HasChild("events", "Events")) {
-    gd::EventsListSerialization::UnserializeEventsFrom(
-        project, events, element.GetChild("events", 0, "Events"));
-  }
+  gd::EventsListSerialization::UnserializeEventsFrom(
+      project, events, element.GetChild("events", 0, "Events"));
 }

 }  // namespace gd
--- a/Core/GDCore/Events/Builtin/WhileEvent.cpp
+++ b/Core/GDCore/Events/Builtin/WhileEvent.cpp
@@ -52,10 +52,8 @@ void WhileEvent::SerializeTo(SerializerElement& element) const {
      conditions, element.AddChild("conditions"));
  gd::EventsListSerialization::SerializeInstructionsTo(
      actions, element.AddChild("actions"));
-
-  if (!events.IsEmpty())
-    gd::EventsListSerialization::SerializeEventsTo(events,
-                                                  element.AddChild("events"));
+  gd::EventsListSerialization::SerializeEventsTo(events,
+                                                 element.AddChild("events"));
 }

 void WhileEvent::UnserializeFrom(gd::Project& project,
@@ -70,12 +68,8 @@ void WhileEvent::UnserializeFrom(gd::Project& project,
      project, conditions, element.GetChild("conditions", 0, "Conditions"));
  gd::EventsListSerialization::UnserializeInstructionsFrom(
      project, actions, element.GetChild("actions", 0, "Actions"));
-
-  events.Clear();
-  if (element.HasChild("events", "Events")) {
-    gd::EventsListSerialization::UnserializeEventsFrom(
-        project, events, element.GetChild("events", 0, "Events"));
-  }
+  gd::EventsListSerialization::UnserializeEventsFrom(
+      project, events, element.GetChild("events", 0, "Events"));
 }

 }  // namespace gd
--- a/Core/GDCore/Events/CodeGeneration/EffectsCodeGenerator.cpp
+++ b/Core/GDCore/Events/CodeGeneration/EffectsCodeGenerator.cpp
@@ -15,44 +15,16 @@
 #include "GDCore/Project/Layout.h"
 #include "GDCore/Project/Object.h"
 #include "GDCore/Project/Project.h"
-#include "GDCore/IDE/ProjectBrowserHelper.h"

 namespace gd {

-void EffectsCodeGenerator::DoVisitObject(gd::Object &object) {
-  auto &effects = object.GetEffects();
-  for (std::size_t e = 0; e < effects.GetEffectsCount(); e++) {
-    auto &effect = effects.GetEffect(e);
-    AddEffectIncludeFiles(effect);
-  }
-};
-
-void EffectsCodeGenerator::AddEffectIncludeFiles(const gd::Effect &effect) {
-  // TODO: this browse all the extensions every time we're trying to find
-  // a new effect. Might be a good idea to rework MetadataProvider to be
-  // faster (not sure if it is a bottleneck at all though - but could be
-  // for events code generation).
-  const gd::EffectMetadata &effectMetadata =
-      MetadataProvider::GetEffectMetadata(platform, effect.GetEffectType());
-
-  for (auto &includeFile : effectMetadata.GetIncludeFiles())
-    includeFiles.insert(includeFile);
-};
-
-void EffectsCodeGenerator::GenerateEffectsIncludeFiles(
-    const gd::Platform &platform,
-    gd::Project &project,
-    std::set<gd::String> &includeFiles) {
-  // TODO Add unit tests on this function.
-  
-  // TODO Merge with UsedExtensionsFinder.
-
+void ExposeProjectEffects(
+    const gd::Project& project,
+    const std::function<void(const gd::Effect& effect)>& worker) {
  // See also gd::Project::ExposeResources for a method that traverse the whole
  // project (this time for resources) and
  // WholeProjectRefactorer::ExposeProjectEvents.

-  EffectsCodeGenerator effectsCodeGenerator(platform, includeFiles);
-
  // Add layouts effects
  for (std::size_t s = 0; s < project.GetLayoutsCount(); s++) {
    auto& layout = project.GetLayout(s);
@@ -61,13 +33,47 @@ void EffectsCodeGenerator::GenerateEffectsIncludeFiles(
      auto& effects = layout.GetLayer(l).GetEffects();
      for (std::size_t e = 0; e < effects.GetEffectsCount(); ++e) {
        auto& effect = effects.GetEffect(e);
-        effectsCodeGenerator.AddEffectIncludeFiles(effect);
+        worker(effect);
+      }
+    }
+
+    for (std::size_t i = 0; i < layout.GetObjectsCount(); i++) {
+      auto& object = layout.GetObject(i);
+      auto& effects = object.GetEffects();
+      for (std::size_t e = 0; e < effects.GetEffectsCount(); e++) {
+        auto& effect = effects.GetEffect(e);
+        worker(effect);
      }
    }
  }

-  // Add objects effects
-  gd::ProjectBrowserHelper::ExposeProjectObjects(project, effectsCodeGenerator);
+  // Add global object effects
+  for (std::size_t s = 0; s < project.GetObjectsCount(); s++) {
+    auto& effects = project.GetObject(s).GetEffects();
+    for (std::size_t e = 0; e < effects.GetEffectsCount(); e++) {
+      auto& effect = effects.GetEffect(e);
+      worker(effect);
+    }
+  }
+}
+
+void EffectsCodeGenerator::GenerateEffectsIncludeFiles(
+    const gd::Platform& platform,
+    const gd::Project& project,
+    std::set<gd::String>& includeFiles) {
+  ExposeProjectEffects(
+      project, [&platform, &includeFiles](const gd::Effect& effect) {
+        // TODO: this browse all the extensions every time we're trying to find
+        // a new effect. Might be a good idea to rework MetadataProvider to be
+        // faster (not sure if it is a bottleneck at all though - but could be
+        // for events code generation).
+        const gd::EffectMetadata& effectMetadata =
+            MetadataProvider::GetEffectMetadata(platform,
+                                                effect.GetEffectType());
+
+        for (auto& includeFile : effectMetadata.GetIncludeFiles())
+          includeFiles.insert(includeFile);
+      });
 }

 }  // namespace gd
--- a/Core/GDCore/Events/CodeGeneration/EffectsCodeGenerator.h
+++ b/Core/GDCore/Events/CodeGeneration/EffectsCodeGenerator.h
@@ -3,18 +3,16 @@
 * Copyright 2008-present Florian Rival (Florian.Rival@gmail.com). All rights
 * reserved. This project is released under the MIT License.
 */
-#pragma once
+#ifndef GDCORE_EffectsCodeGenerator_H
+#define GDCORE_EffectsCodeGenerator_H

 #include <set>
 #include <utility>
 #include <vector>
 #include "GDCore/String.h"
-#include "GDCore/IDE/Project/ArbitraryObjectsWorker.h"
-
 namespace gd {
 class Project;
 class Platform;
-class Effect;
 }  // namespace gd

 namespace gd {
@@ -22,26 +20,16 @@ namespace gd {
 /**
 * \brief Internal class used to generate code from events
 */
-class GD_CORE_API EffectsCodeGenerator : public ArbitraryObjectsWorker {
-public:
+class GD_CORE_API EffectsCodeGenerator {
+ public:
  /**
   * \brief Add all the include files required by the project effects.
   */
  static void GenerateEffectsIncludeFiles(const gd::Platform& platform,
-                                          gd::Project& project,
+                                          const gd::Project& project,
                                          std::set<gd::String>& includeFiles);
-
-private:
-  EffectsCodeGenerator(const gd::Platform &platform_,
-                       std::set<gd::String> &includeFiles_)
-      : platform(platform_), includeFiles(includeFiles_){};
-
-  void AddEffectIncludeFiles(const gd::Effect& effect);
-
-  void DoVisitObject(gd::Object &object) override;
-
-  const gd::Platform &platform;
-  std::set<gd::String> &includeFiles;
 };

 }  // namespace gd
+
+#endif  // GDCORE_EffectsCodeGenerator_H
--- a/Core/GDCore/Events/CodeGeneration/EventsCodeGenerationContext.cpp
+++ b/Core/GDCore/Events/CodeGeneration/EventsCodeGenerationContext.cpp
@@ -4,9 +4,7 @@
 * reserved. This project is released under the MIT License.
 */
 #include "GDCore/Events/CodeGeneration/EventsCodeGenerationContext.h"
-
 #include <set>
-
 #include "GDCore/CommonTools.h"
 #include "GDCore/Events/CodeGeneration/EventsCodeGenerator.h"
 #include "GDCore/Events/Tools/EventsCodeNameMangler.h"
@@ -16,7 +14,7 @@ using namespace std;
 namespace gd {

 void EventsCodeGenerationContext::InheritsFrom(
-    EventsCodeGenerationContext& parent_) {
+    const EventsCodeGenerationContext& parent_) {
  parent = &parent_;

  // Objects lists declared by parent became "already declared" in the child
@@ -26,8 +24,8 @@ void EventsCodeGenerationContext::InheritsFrom(
            parent_.objectsListsToBeDeclared.end(),
            std::inserter(alreadyDeclaredObjectsLists,
                          alreadyDeclaredObjectsLists.begin()));
-  std::copy(parent_.objectsListsOrEmptyToBeDeclared.begin(),
-            parent_.objectsListsOrEmptyToBeDeclared.end(),
+  std::copy(parent_.objectsListsWithoutPickingToBeDeclared.begin(),
+            parent_.objectsListsWithoutPickingToBeDeclared.end(),
            std::inserter(alreadyDeclaredObjectsLists,
                          alreadyDeclaredObjectsLists.begin()));
  std::copy(parent_.emptyObjectsListsToBeDeclared.begin(),
@@ -35,8 +33,6 @@ void EventsCodeGenerationContext::InheritsFrom(
            std::inserter(alreadyDeclaredObjectsLists,
                          alreadyDeclaredObjectsLists.begin()));

-  nearestAsyncParent = parent_.IsAsyncCallback() ? &parent_ : parent_.nearestAsyncParent;
-  asyncDepth = parent_.asyncDepth;
  depthOfLastUse = parent_.depthOfLastUse;
  customConditionDepth = parent_.customConditionDepth;
  contextDepth = parent_.GetContextDepth() + 1;
@@ -46,59 +42,33 @@ void EventsCodeGenerationContext::InheritsFrom(
  }
 }

-void EventsCodeGenerationContext::InheritsAsAsyncCallbackFrom(
-    EventsCodeGenerationContext& parent_) {
-  // Increasing the async depth is enough to mark the context as an async callback.
-  InheritsFrom(parent_);
-  asyncDepth = parent_.asyncDepth + 1;
-}
-
 void EventsCodeGenerationContext::Reuse(
-    EventsCodeGenerationContext& parent_) {
+    const EventsCodeGenerationContext& parent_) {
  InheritsFrom(parent_);
  if (parent_.CanReuse())
    contextDepth = parent_.GetContextDepth();  // Keep same context depth
 }

-void EventsCodeGenerationContext::NotifyAsyncParentsAboutDeclaredObject(const gd::String& objectName) {
-  gd::EventsCodeGenerationContext* asyncContext = IsAsyncCallback() ? this : nearestAsyncParent;
-  for (;
-        asyncContext != nullptr;
-        asyncContext = asyncContext->parent->nearestAsyncParent)
-    asyncContext->allObjectsListToBeDeclaredAcrossChildren.insert(objectName);
-}
-
 void EventsCodeGenerationContext::ObjectsListNeeded(
    const gd::String& objectName) {
-  if (!IsToBeDeclared(objectName)) {
+  if (!IsToBeDeclared(objectName))
    objectsListsToBeDeclared.insert(objectName);

-    if (IsInsideAsync()) {
-      NotifyAsyncParentsAboutDeclaredObject(objectName);
-    }
-  }
-
  depthOfLastUse[objectName] = GetContextDepth();
 }

-void EventsCodeGenerationContext::ObjectsListNeededOrEmptyIfJustDeclared(
+void EventsCodeGenerationContext::ObjectsListWithoutPickingNeeded(
    const gd::String& objectName) {
-  if (!IsToBeDeclared(objectName)) {
-    objectsListsOrEmptyToBeDeclared.insert(objectName);
-
-    if (IsInsideAsync()) {
-      NotifyAsyncParentsAboutDeclaredObject(objectName);
-    }
-  }
+  if (!IsToBeDeclared(objectName))
+    objectsListsWithoutPickingToBeDeclared.insert(objectName);

  depthOfLastUse[objectName] = GetContextDepth();
 }

 void EventsCodeGenerationContext::EmptyObjectsListNeeded(
    const gd::String& objectName) {
-  if (!IsToBeDeclared(objectName)) {
+  if (!IsToBeDeclared(objectName))
    emptyObjectsListsToBeDeclared.insert(objectName);
-  }

  depthOfLastUse[objectName] = GetContextDepth();
 }
@@ -107,8 +77,8 @@ std::set<gd::String> EventsCodeGenerationContext::GetAllObjectsToBeDeclared()
    const {
  std::set<gd::String> allObjectListsToBeDeclared(
      objectsListsToBeDeclared.begin(), objectsListsToBeDeclared.end());
-  allObjectListsToBeDeclared.insert(objectsListsOrEmptyToBeDeclared.begin(),
-                                    objectsListsOrEmptyToBeDeclared.end());
+  allObjectListsToBeDeclared.insert(objectsListsWithoutPickingToBeDeclared.begin(),
+                                    objectsListsWithoutPickingToBeDeclared.end());
  allObjectListsToBeDeclared.insert(emptyObjectsListsToBeDeclared.begin(),
                                    emptyObjectsListsToBeDeclared.end());

@@ -132,21 +102,4 @@ bool EventsCodeGenerationContext::IsSameObjectsList(
         otherContext.GetLastDepthObjectListWasNeeded(objectName);
 }

-bool EventsCodeGenerationContext::ShouldUseAsyncObjectsList(
-    const gd::String& objectName) const {
-  if (!IsInsideAsync()) return false;
-
-  // Check if the objects list was used after (or in) the nearest async callback context.
-  const gd::EventsCodeGenerationContext* asyncContext = IsAsyncCallback() ? this : nearestAsyncParent;
-  if (parent->GetLastDepthObjectListWasNeeded(objectName) >= asyncContext->GetContextDepth()) {
-    // The object was used in a context after (or in) the nearest async parent context, so we're not getting it from the
-    // async object lists (it was already gotten from there in this previous context).
-    return false;
-  }
-
-  // If the objects list is declared in a parent of the nearest async context, it means
-  // the async context had to use an async objects list to access it.
-  return asyncContext->ObjectAlreadyDeclaredByParents(objectName);
-};
-
 }  // namespace gd
--- a/Core/GDCore/Events/CodeGeneration/EventsCodeGenerationContext.h
+++ b/Core/GDCore/Events/CodeGeneration/EventsCodeGenerationContext.h
@@ -8,7 +8,6 @@
 #include <map>
 #include <memory>
 #include <set>
-
 #include "GDCore/String.h"

 namespace gd {
@@ -34,7 +33,11 @@ class GD_CORE_API EventsCodeGenerationContext {
   * updated to contain the maximal scope depth reached.
   */
  EventsCodeGenerationContext(unsigned int* maxDepthLevel_ = nullptr)
-      : maxDepthLevel(maxDepthLevel_){};
+      : contextDepth(0),
+        customConditionDepth(0),
+        maxDepthLevel(maxDepthLevel_),
+        parent(NULL),
+        reuseExplicitlyForbidden(false){};
  virtual ~EventsCodeGenerationContext(){};

  /**
@@ -42,13 +45,7 @@ class GD_CORE_API EventsCodeGenerationContext {
   * another one. The child will then for example not declare again objects
   * already declared by its parent.
   */
-  void InheritsFrom(EventsCodeGenerationContext& parent);
-
-  /**
-   * Call this method to make an EventsCodeGenerationContext as a "child" of
-   * another one, but in the context of an async function.
-   */
-  void InheritsAsAsyncCallbackFrom(EventsCodeGenerationContext& parent);
+  void InheritsFrom(const EventsCodeGenerationContext& parent);

  /**
   * \brief As InheritsFrom, mark the context as being the child of another one,
@@ -56,7 +53,7 @@ class GD_CORE_API EventsCodeGenerationContext {
   *
   * Used for example for optimizing the last event of a list.
   */
-  void Reuse(EventsCodeGenerationContext& parent);
+  void Reuse(const EventsCodeGenerationContext& parent);

  /**
   * \brief Forbid any optimization that would reuse and modify the object list
@@ -91,19 +88,19 @@ class GD_CORE_API EventsCodeGenerationContext {
  const EventsCodeGenerationContext* GetParentContext() const { return parent; }

  /**
-   * Mark the object as being the object being handled by the instruction.
+   * Mark the object has being the object being handled by the instruction
   */
  void SetCurrentObject(const gd::String& objectName) {
    currentObject = objectName;
  };

  /**
-   * Set that no particular object is being handled by an instruction.
+   * Set that no particular object is being handled by an instruction
   */
  void SetNoCurrentObject() { currentObject = ""; };

  /**
-   * Get the object being handled by the instruction.
+   * Get the object being handled by the instruction
   */
  const gd::String& GetCurrentObject() const { return currentObject; };

@@ -112,7 +109,7 @@ class GD_CORE_API EventsCodeGenerationContext {
   *
   * The list will be filled with objects from the scene if it is the first time
   * it is requested, unless there is already an object list with this name
-   * (i.e. `ObjectAlreadyDeclaredByParents(objectName)` returns true).
+   * (i.e. `ObjectAlreadyDeclared(objectName)` returns true).
   */
  void ObjectsListNeeded(const gd::String& objectName);

@@ -124,7 +121,7 @@ class GD_CORE_API EventsCodeGenerationContext {
   * from the scene. If there is already an objects list with this name, no new
   * list will be declared again.
   */
-  void ObjectsListNeededOrEmptyIfJustDeclared(const gd::String& objectName);
+  void ObjectsListWithoutPickingNeeded(const gd::String& objectName);

  /**
   * Call this when an instruction in the event needs an empty object list,
@@ -137,21 +134,29 @@ class GD_CORE_API EventsCodeGenerationContext {
  void EmptyObjectsListNeeded(const gd::String& objectName);

  /**
-   * Return true if an object list has already been declared by the parent contexts.
+   * Return true if an object list has already been declared (or is going to be
+   * declared).
   */
-  bool ObjectAlreadyDeclaredByParents(const gd::String& objectName) const {
+  bool ObjectAlreadyDeclared(const gd::String& objectName) const {
    return (alreadyDeclaredObjectsLists.find(objectName) !=
            alreadyDeclaredObjectsLists.end());
  };

+  /**
+   * \brief Consider that \a objectName is now declared in the context.
+   */
+  void SetObjectDeclared(const gd::String& objectName) {
+    alreadyDeclaredObjectsLists.insert(objectName);
+  }
+
  /**
   * Return all the objects lists which will be declared by the current context
-   * (normal, potentially empty or empty).
+   * ( the non empty as well as the empty objects lists )
   */
  std::set<gd::String> GetAllObjectsToBeDeclared() const;

  /**
-   * Return the objects lists which will be declared by the current context.
+   * Return the objects lists which will be declared by the current context
   */
  const std::set<gd::String>& GetObjectsListsToBeDeclared() const {
    return objectsListsToBeDeclared;
@@ -161,9 +166,9 @@ class GD_CORE_API EventsCodeGenerationContext {
   * Return the objects lists which will be will be declared, without filling
   * them with objects from the scene.
   */
-  const std::set<gd::String>& GetObjectsListsToBeEmptyIfJustDeclared()
+  const std::set<gd::String>& GetObjectsListsToBeDeclaredWithoutPicking()
      const {
-    return objectsListsOrEmptyToBeDeclared;
+    return objectsListsWithoutPickingToBeDeclared;
  };

  /**
@@ -179,7 +184,7 @@ class GD_CORE_API EventsCodeGenerationContext {
   * Return the objects lists which are already declared and can be used in the
   * current context without declaration.
   */
-  const std::set<gd::String>& GetObjectsListsAlreadyDeclaredByParents() const {
+  const std::set<gd::String>& GetObjectsListsAlreadyDeclared() const {
    return alreadyDeclaredObjectsLists;
  };

@@ -222,55 +227,22 @@ class GD_CORE_API EventsCodeGenerationContext {
   */
  size_t GetCurrentConditionDepth() const { return customConditionDepth; }

-  /**
-   * \brief Returns the list of all objects declared in this context
-   * and subcontexts.
-   * \warning Only works on an async callback's context.
-   *
-   * It is to be used by the Async event code generator to know what objects
-   * lists to backup for the async callback and async callbacks after it.
-   */
-  const std::set<gd::String>& GetAllDeclaredObjectsAcrossChildren() {
-    return allObjectsListToBeDeclaredAcrossChildren;
-  };
-
-  /**
-   * Returns true if an object list should be gotten from a backed up
-   * objects list instead of the parent context. This can happen inside an
-   * asynchronous callback or a child context of an asynchronous callback (i.e:
-   * the `asyncDepth` is not 0).
-   */
-  bool ShouldUseAsyncObjectsList(const gd::String& objectName) const;
-
-  /**
-   * Returns true if the code currently being generated is inside an
-   * asynchronous context (either in an asynchronous callback, or in a children of
-   * an asynchronous callback).
-   */
-  bool IsInsideAsync() const { return asyncDepth != 0; };
-
-  /**
-   * Returns true if the code currently being generated is an asynchronous
-   * callback (but not a child of an asynchronous callback).
-   */
-  bool IsAsyncCallback() const { return parent != nullptr && parent->asyncDepth != asyncDepth; }
-
+ private:
  /**
   * \brief Returns true if the given object is already going to be declared
-   * in this context (either as a traditional objects list, or an empty one).
+   * (either as a traditional objects list, or one without picking, or one
+   * empty).
+   *
   */
  bool IsToBeDeclared(const gd::String& objectName) {
    return objectsListsToBeDeclared.find(objectName) !=
               objectsListsToBeDeclared.end() ||
-           objectsListsOrEmptyToBeDeclared.find(objectName) !=
-               objectsListsOrEmptyToBeDeclared.end() ||
+           objectsListsWithoutPickingToBeDeclared.find(objectName) !=
+               objectsListsWithoutPickingToBeDeclared.end() ||
           emptyObjectsListsToBeDeclared.find(objectName) !=
               emptyObjectsListsToBeDeclared.end();
  };

- private:
-  void NotifyAsyncParentsAboutDeclaredObject(const gd::String& objectName);
-
  std::set<gd::String>
      alreadyDeclaredObjectsLists;  ///< Objects lists already needed in a
                                    ///< parent context.
@@ -278,7 +250,7 @@ class GD_CORE_API EventsCodeGenerationContext {
      objectsListsToBeDeclared;  ///< Objects lists that will be declared in
                                 ///< this context.
  std::set<gd::String>
-      objectsListsOrEmptyToBeDeclared;  ///< Objects lists that will be
+      objectsListsWithoutPickingToBeDeclared;  ///< Objects lists that will be
                                               ///< declared in this context,
                                               ///< but not filled with scene's
                                               ///< objects.
@@ -288,40 +260,21 @@ class GD_CORE_API EventsCodeGenerationContext {
                                      ///< but not filled with scene's
                                      ///< objects and not filled with any
                                      ///< previously existing objects list.
-  std::set<gd::String>
-      allObjectsListToBeDeclaredAcrossChildren;  ///< This is only to be used by
-                                                 ///< the async callback
-                                                 ///< contexts to know all
-                                                 ///< objects declared across
-                                                 ///< all children, so that the
-                                                 ///< necessary objects can be
-                                                 ///< backed up.
-
  std::map<gd::String, unsigned int>
      depthOfLastUse;  ///< The context depth when an object was last used.
  gd::String
      currentObject;  ///< The object being used by an action or condition.
-  unsigned int contextDepth = 0;  ///< The depth of the context: 0 for a newly
-                                  ///< created context, n+1 for any context
-                                  ///< inheriting from context with depth n.
-  unsigned int customConditionDepth =
-      0;  ///< The depth of the conditions being generated.
-  unsigned int asyncDepth =
-      0;  ///< If higher than 0, the current context is an asynchronous callback,
-          ///< or a child context of an asynchronous callback:
-          ///< - If the parent's async depth != the current context async depth,
-          ///<   then the current context is an asynchronous callback context.
-          ///< - Otherwise, it's a child of an asynchronous callback.
+  unsigned int contextDepth;  ///< The depth of the context : 0 for a newly
+                              ///< created context, n+1 for any context
+                              ///< inheriting from context with depth n.
+  unsigned int
+      customConditionDepth;  ///< The depth of the conditions being generated.
  unsigned int* maxDepthLevel;  ///< A pointer to a unsigned int updated with
                                ///< the maximum depth reached.
-  const EventsCodeGenerationContext* parent =
-      nullptr;  ///< The parent of the current context. Can be NULL.
-  EventsCodeGenerationContext* nearestAsyncParent =
-      nullptr;  ///< The nearest parent context that is an async callback
-                ///< context.
-  bool reuseExplicitlyForbidden =
-      false;  ///< If set to true, forbid children contexts
-              ///< to reuse this one without inheriting.
+  const EventsCodeGenerationContext*
+      parent;  ///< The parent of the current context. Can be NULL.
+  bool reuseExplicitlyForbidden;  ///< If set to true, forbid children context
+                                  ///< to reuse this one without inheriting.
 };

 }  // namespace gd
--- a/Core/GDCore/Events/CodeGeneration/EventsCodeGenerator.cpp
+++ b/Core/GDCore/Events/CodeGeneration/EventsCodeGenerator.cpp
@@ -16,7 +16,6 @@
 #include "GDCore/Extensions/PlatformExtension.h"
 #include "GDCore/Project/Layout.h"
 #include "GDCore/Project/ObjectsContainer.h"
-#include "GDCore/Project/ObjectsContainersList.h"
 #include "GDCore/Project/Project.h"

 using namespace std;
@@ -44,7 +43,7 @@ gd::String EventsCodeGenerator::GenerateRelationalOperatorCall(
  std::size_t relationalOperatorIndex = instrInfos.parameters.size();
  for (std::size_t i = startFromArgument; i < instrInfos.parameters.size();
       ++i) {
-    if (instrInfos.parameters[i].GetType() == "relationalOperator")
+    if (instrInfos.parameters[i].type == "relationalOperator")
      relationalOperatorIndex = i;
  }
  // Ensure that there is at least one parameter after the relational operator
@@ -69,36 +68,8 @@ gd::String EventsCodeGenerator::GenerateRelationalOperatorCall(
    }
  }

-  auto lhs = callStartString + "(" + argumentsStr + ")";
-  return GenerateRelationalOperation(relationalOperator, lhs, rhs);
-}
-
-/**
- * @brief Generate a relational operation
- * 
- * @param relationalOperator the operator
- * @param lhs the left hand operand
- * @param rhs the right hand operand
- * @return gd::String 
- */
-gd::String EventsCodeGenerator::GenerateRelationalOperation(
-    const gd::String& relationalOperator,
-    const gd::String& lhs,
-    const gd::String& rhs) {
-  return lhs + " " + GenerateRelationalOperatorCodes(relationalOperator) + " " + rhs;
-}
-
-const gd::String EventsCodeGenerator::GenerateRelationalOperatorCodes(const gd::String &operatorString) {
-    if (operatorString == "=") {
-        return "==";
-    }
-    if (operatorString != "<" && operatorString != ">" &&
-        operatorString != "<=" && operatorString != ">=" && operatorString != "!=" &&
-        operatorString != "startsWith" && operatorString != "endsWith" && operatorString != "contains") {
-      cout << "Warning: Bad relational operator: Set to == by default." << endl;
-      return "==";
-    }
-    return operatorString;
+  return callStartString + "(" + argumentsStr + ") " + relationalOperator +
+         " " + rhs;
 }

 /**
@@ -124,7 +95,7 @@ gd::String EventsCodeGenerator::GenerateOperatorCall(
  std::size_t operatorIndex = instrInfos.parameters.size();
  for (std::size_t i = startFromArgument; i < instrInfos.parameters.size();
       ++i) {
-    if (instrInfos.parameters[i].GetType() == "operator") operatorIndex = i;
+    if (instrInfos.parameters[i].type == "operator") operatorIndex = i;
  }

  // Ensure that there is at least one parameter after the operator
@@ -193,7 +164,7 @@ gd::String EventsCodeGenerator::GenerateCompoundOperatorCall(
  std::size_t operatorIndex = instrInfos.parameters.size();
  for (std::size_t i = startFromArgument; i < instrInfos.parameters.size();
       ++i) {
-    if (instrInfos.parameters[i].GetType() == "operator") operatorIndex = i;
+    if (instrInfos.parameters[i].type == "operator") operatorIndex = i;
  }

  // Ensure that there is at least one parameter after the operator
@@ -244,7 +215,7 @@ gd::String EventsCodeGenerator::GenerateMutatorCall(
  std::size_t operatorIndex = instrInfos.parameters.size();
  for (std::size_t i = startFromArgument; i < instrInfos.parameters.size();
       ++i) {
-    if (instrInfos.parameters[i].GetType() == "operator") operatorIndex = i;
+    if (instrInfos.parameters[i].type == "operator") operatorIndex = i;
  }

  // Ensure that there is at least one parameter after the operator
@@ -296,12 +267,14 @@ gd::String EventsCodeGenerator::GenerateConditionCode(
    return "/* Unknown instruction - skipped. */";
  }

-  AddIncludeFiles(instrInfos.GetIncludeFiles());
+  AddIncludeFiles(instrInfos.codeExtraInformation.GetIncludeFiles());
  maxConditionsListsSize =
      std::max(maxConditionsListsSize, condition.GetSubInstructions().size());

-  if (instrInfos.HasCustomCodeGenerator()) {
+  if (instrInfos.codeExtraInformation.HasCustomCodeGenerator()) {
    context.EnterCustomCondition();
+    conditionCode += GenerateReferenceToUpperScopeBoolean(
+        "conditionTrue", returnBoolean, context);
    conditionCode += instrInfos.codeExtraInformation.customCodeGenerator(
        condition, *this, context);
    maxCustomConditionsDepth =
@@ -318,17 +291,23 @@ gd::String EventsCodeGenerator::GenerateConditionCode(
    condition.SetParameters(parameters);
  }

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

-      if (!GetObjectsContainersList().HasObjectOrGroupNamed(objectInParameter)) {
+      if (!GetObjectsAndGroups().HasObjectNamed(objectInParameter) &&
+          !GetGlobalObjectsAndGroups().HasObjectNamed(objectInParameter) &&
+          !GetObjectsAndGroups().GetObjectGroups().Has(objectInParameter) &&
+          !GetGlobalObjectsAndGroups().GetObjectGroups().Has(
+              objectInParameter)) {
        return "/* Unknown object - skipped. */";
-      } else if (!instrInfos.parameters[pNb].GetExtraInfo().empty() &&
-                GetObjectsContainersList().GetTypeOfObject(objectInParameter) !=
-                     instrInfos.parameters[pNb].GetExtraInfo()) {
+      } else if (!instrInfos.parameters[pNb].supplementaryInformation.empty() &&
+                 gd::GetTypeOfObject(GetGlobalObjectsAndGroups(),
+                                     GetObjectsAndGroups(),
+                                     objectInParameter) !=
+                     instrInfos.parameters[pNb].supplementaryInformation) {
        return "/* Mismatched object type - skipped. */";
      }
    }
@@ -338,13 +317,19 @@ gd::String EventsCodeGenerator::GenerateConditionCode(
    gd::String objectName = condition.GetParameter(0).GetPlainString();
    if (!objectName.empty() && !instrInfos.parameters.empty()) {
      std::vector<gd::String> realObjects =
-          GetObjectsContainersList().ExpandObjectName(objectName, context.GetCurrentObject());
+          ExpandObjectsName(objectName, context);
      for (std::size_t i = 0; i < realObjects.size(); ++i) {
        // Set up the context
-        gd::String objectType = GetObjectsContainersList().GetTypeOfObject(realObjects[i]);
+        gd::String objectType = gd::GetTypeOfObject(
+            GetGlobalObjectsAndGroups(), GetObjectsAndGroups(), realObjects[i]);
        const ObjectMetadata& objInfo =
            MetadataProvider::GetObjectMetadata(platform, objectType);

+        if (objInfo.IsUnsupportedBaseObjectCapability(
+                instrInfos.GetRequiredBaseObjectCapability())) {
+          conditionCode +=
+              "/* Object with unsupported capability - skipped. */\n";
+        } else {
          AddIncludeFiles(objInfo.includeFiles);
          context.SetCurrentObject(realObjects[i]);
          context.ObjectsListNeeded(realObjects[i]);
@@ -361,14 +346,18 @@ gd::String EventsCodeGenerator::GenerateConditionCode(
                                                   context);

          context.SetNoCurrentObject();
+        }
      }
    }
  } else if (instrInfos.IsBehaviorInstruction()) {
    gd::String objectName = condition.GetParameter(0).GetPlainString();
-    gd::String behaviorType = GetObjectsContainersList().GetTypeOfBehavior(condition.GetParameter(1).GetPlainString());
+    gd::String behaviorType =
+        gd::GetTypeOfBehavior(GetGlobalObjectsAndGroups(),
+                              GetObjectsAndGroups(),
+                              condition.GetParameter(1).GetPlainString());
    if (instrInfos.parameters.size() >= 2) {
      std::vector<gd::String> realObjects =
-          GetObjectsContainersList().ExpandObjectName(objectName, context.GetCurrentObject());
+          ExpandObjectsName(objectName, context);
      for (std::size_t i = 0; i < realObjects.size(); ++i) {
        // Setup context
        const BehaviorMetadata& autoInfo =
@@ -461,9 +450,7 @@ gd::String EventsCodeGenerator::GenerateConditionsListCode(
 * Generate code for an action.
 */
 gd::String EventsCodeGenerator::GenerateActionCode(
-    gd::Instruction& action,
-    EventsCodeGenerationContext& context,
-    const gd::String& optionalAsyncCallbackName) {
+    gd::Instruction& action, EventsCodeGenerationContext& context) {
  gd::String actionCode;

  const gd::InstructionMetadata& instrInfos =
@@ -472,21 +459,13 @@ gd::String EventsCodeGenerator::GenerateActionCode(
    return "/* Unknown instruction - skipped. */";
  }

-  AddIncludeFiles(instrInfos.GetIncludeFiles());
+  AddIncludeFiles(instrInfos.codeExtraInformation.GetIncludeFiles());

-  if (instrInfos.HasCustomCodeGenerator()) {
+  if (instrInfos.codeExtraInformation.HasCustomCodeGenerator()) {
    return instrInfos.codeExtraInformation.customCodeGenerator(
        action, *this, context);
  }

-  // Get the correct function name depending on whether it should be async or
-  // not.
-  const gd::String& functionCallName =
-      instrInfos.IsAsync() &&
-              (!instrInfos.IsOptionallyAsync() || action.IsAwaited())
-          ? instrInfos.codeExtraInformation.asyncFunctionCallName
-          : instrInfos.codeExtraInformation.functionCallName;
-
  // Be sure there is no lack of parameter.
  while (action.GetParameters().size() < instrInfos.parameters.size()) {
    vector<gd::Expression> parameters = action.GetParameters();
@@ -494,15 +473,21 @@ gd::String EventsCodeGenerator::GenerateActionCode(
    action.SetParameters(parameters);
  }

-  // Verify that there are no mismatches between object type in parameters.
+  // Verify that there are no mismatchs between object type in parameters.
  for (std::size_t pNb = 0; pNb < instrInfos.parameters.size(); ++pNb) {
-    if (ParameterMetadata::IsObject(instrInfos.parameters[pNb].GetType())) {
+    if (ParameterMetadata::IsObject(instrInfos.parameters[pNb].type)) {
      gd::String objectInParameter = action.GetParameter(pNb).GetPlainString();
-      if (!GetObjectsContainersList().HasObjectOrGroupNamed(objectInParameter)) {
+      if (!GetObjectsAndGroups().HasObjectNamed(objectInParameter) &&
+          !GetGlobalObjectsAndGroups().HasObjectNamed(objectInParameter) &&
+          !GetObjectsAndGroups().GetObjectGroups().Has(objectInParameter) &&
+          !GetGlobalObjectsAndGroups().GetObjectGroups().Has(
+              objectInParameter)) {
        return "/* Unknown object - skipped. */";
-      } else if (!instrInfos.parameters[pNb].GetExtraInfo().empty() &&
-                 GetObjectsContainersList().GetTypeOfObject(objectInParameter) !=
-                     instrInfos.parameters[pNb].GetExtraInfo()) {
+      } else if (!instrInfos.parameters[pNb].supplementaryInformation.empty() &&
+                 gd::GetTypeOfObject(GetGlobalObjectsAndGroups(),
+                                     GetObjectsAndGroups(),
+                                     objectInParameter) !=
+                     instrInfos.parameters[pNb].supplementaryInformation) {
        return "/* Mismatched object type - skipped. */";
      }
    }
@@ -514,13 +499,18 @@ gd::String EventsCodeGenerator::GenerateActionCode(

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

+        if (objInfo.IsUnsupportedBaseObjectCapability(
+                instrInfos.GetRequiredBaseObjectCapability())) {
+          actionCode += "/* Object with unsupported capability - skipped. */\n";
+        } else {
          AddIncludeFiles(objInfo.includeFiles);
          context.SetCurrentObject(realObjects[i]);
          context.ObjectsListNeeded(realObjects[i]);
@@ -528,24 +518,23 @@ gd::String EventsCodeGenerator::GenerateActionCode(
          // Prepare arguments and generate the whole action code
          vector<gd::String> arguments = GenerateParametersCodes(
              action.GetParameters(), instrInfos.parameters, context);
-          actionCode += GenerateObjectAction(realObjects[i],
-                                             objInfo,
-                                             functionCallName,
-                                             arguments,
-                                             instrInfos,
-                                             context,
-                                             optionalAsyncCallbackName);
+          actionCode += GenerateObjectAction(
+              realObjects[i], objInfo, arguments, instrInfos, context);

          context.SetNoCurrentObject();
+        }
      }
    }
  } else if (instrInfos.IsBehaviorInstruction()) {
    gd::String objectName = action.GetParameter(0).GetPlainString();
-    gd::String behaviorType = GetObjectsContainersList().GetTypeOfBehavior(action.GetParameter(1).GetPlainString());
+    gd::String behaviorType =
+        gd::GetTypeOfBehavior(GetGlobalObjectsAndGroups(),
+                              GetObjectsAndGroups(),
+                              action.GetParameter(1).GetPlainString());

    if (instrInfos.parameters.size() >= 2) {
      std::vector<gd::String> realObjects =
-          GetObjectsContainersList().ExpandObjectName(objectName, context.GetCurrentObject());
+          ExpandObjectsName(objectName, context);
      for (std::size_t i = 0; i < realObjects.size(); ++i) {
        // Setup context
        const BehaviorMetadata& autoInfo =
@@ -561,11 +550,9 @@ gd::String EventsCodeGenerator::GenerateActionCode(
            GenerateBehaviorAction(realObjects[i],
                                   action.GetParameter(1).GetPlainString(),
                                   autoInfo,
-                                   functionCallName,
                                   arguments,
                                   instrInfos,
-                                   context,
-                                   optionalAsyncCallbackName);
+                                   context);

        context.SetNoCurrentObject();
      }
@@ -573,75 +560,12 @@ gd::String EventsCodeGenerator::GenerateActionCode(
  } else {
    vector<gd::String> arguments = GenerateParametersCodes(
        action.GetParameters(), instrInfos.parameters, context);
-    actionCode += GenerateFreeAction(functionCallName,
-                                     arguments,
-                                     instrInfos,
-                                     context,
-                                     optionalAsyncCallbackName);
+    actionCode += GenerateFreeAction(arguments, instrInfos, context);
  }

  return actionCode;
 }

-const EventsCodeGenerator::CallbackDescriptor
-EventsCodeGenerator::GenerateCallback(
-    const gd::String& callbackID,
-    gd::EventsCodeGenerationContext& parentContext,
-    gd::InstructionsList& actions,
-    gd::EventsList* subEvents) {
-  gd::EventsCodeGenerationContext callbackContext;
-  callbackContext.InheritsAsAsyncCallbackFrom(parentContext);
-  const gd::String callbackFunctionName =
-      GetCodeNamespaceAccessor() + "asyncCallback" + callbackID;
-  const gd::String callbackFunctionArguments =
-      GenerateEventsParameters(callbackContext);
-
-  // Generate actions
-  gd::String actionsCode = GenerateActionsListCode(actions, callbackContext);
-
-  // Generate subevents
-  if (subEvents != nullptr)  // Sub events
-  {
-    actionsCode += "\n{ //Subevents\n";
-    actionsCode += GenerateEventsListCode(*subEvents, callbackContext);
-    actionsCode += "} //End of subevents\n";
-  }
-
-  // Compose the callback function and add outside main
-  const gd::String actionsDeclarationsCode =
-      GenerateObjectsDeclarationCode(callbackContext);
-
-  const gd::String callbackCode = callbackFunctionName + " = function (" +
-                                  GenerateEventsParameters(callbackContext) +
-                                  ") {\n" + actionsDeclarationsCode +
-                                  actionsCode + "}\n";
-
-  AddCustomCodeOutsideMain(callbackCode);
-
-  std::set<gd::String> requiredObjects;
-  // Build the list of all objects required by the callback. Any object that has
-  // already been declared could have gone through previous object picking, so
-  // if such an object is used by the actions or subevents of this callback, we
-  // must ask the caller to pass the already existing objects lists through a
-  // `LongLivedObjectsList` to the callback function.
-  for (const auto& objectUsedInSubTree :
-       callbackContext.GetAllDeclaredObjectsAcrossChildren()) {
-    if (callbackContext.ObjectAlreadyDeclaredByParents(objectUsedInSubTree))
-      requiredObjects.insert(objectUsedInSubTree);
-  };
-
-  return CallbackDescriptor(
-      callbackFunctionName, callbackFunctionArguments, requiredObjects);
-};
-
-const gd::String EventsCodeGenerator::GenerateEventsParameters(
-    const gd::EventsCodeGenerationContext& context) {
-  gd::String parameters = "runtimeScene";
-  if (!HasProjectAndLayout()) parameters += ", eventsFunctionContext";
-  if (context.IsInsideAsync()) parameters += ", asyncObjectsList";
-  return parameters;
-};
-
 /**
 * Generate actions code.
 */
@@ -667,7 +591,7 @@ gd::String EventsCodeGenerator::GenerateActionsListCode(
 }

 gd::String EventsCodeGenerator::GenerateParameterCodes(
-    const gd::Expression& parameter,
+    const gd::String& parameter,
    const gd::ParameterMetadata& metadata,
    gd::EventsCodeGenerationContext& context,
    const gd::String& lastObjectName,
@@ -675,25 +599,30 @@ gd::String EventsCodeGenerator::GenerateParameterCodes(
        supplementaryParametersTypes) {
  gd::String argOutput;

-  if (ParameterMetadata::IsExpression("number", metadata.GetType())) {
+  if (ParameterMetadata::IsExpression("number", metadata.type)) {
    argOutput = gd::ExpressionCodeGenerator::GenerateExpressionCode(
-        *this, context, "number", parameter, lastObjectName);
-  } else if (ParameterMetadata::IsExpression("string", metadata.GetType())) {
+        *this, context, "number", parameter);
+  } else if (ParameterMetadata::IsExpression("string", metadata.type)) {
    argOutput = gd::ExpressionCodeGenerator::GenerateExpressionCode(
-        *this, context, "string", parameter, lastObjectName);
-  } else if (ParameterMetadata::IsExpression("variable", metadata.GetType())) {
+        *this, context, "string", parameter);
+  } else if (ParameterMetadata::IsExpression("variable", metadata.type)) {
    argOutput = gd::ExpressionCodeGenerator::GenerateExpressionCode(
-        *this, context, metadata.GetType(), parameter, lastObjectName);
-  } else if (ParameterMetadata::IsObject(metadata.GetType())) {
+        *this, context, metadata.type, parameter, lastObjectName);
+  } else if (ParameterMetadata::IsObject(metadata.type)) {
    // It would be possible to run a gd::ExpressionCodeGenerator if later
    // objects can have nested objects, or function returning objects.
-    argOutput =
-        GenerateObject(parameter.GetPlainString(), metadata.GetType(), context);
-  } else if (metadata.GetType() == "relationalOperator") {
-    argOutput += parameter.GetPlainString();
+    argOutput = GenerateObject(parameter, metadata.type, context);
+  } else if (metadata.type == "relationalOperator") {
+    argOutput += parameter == "=" ? "==" : parameter;
+    if (argOutput != "==" && argOutput != "<" && argOutput != ">" &&
+        argOutput != "<=" && argOutput != ">=" && argOutput != "!=") {
+      cout << "Warning: Bad relational operator: Set to == by default." << endl;
+      argOutput = "==";
+    }
+
    argOutput = "\"" + argOutput + "\"";
-  } else if (metadata.GetType() == "operator") {
-    argOutput += parameter.GetPlainString();
+  } else if (metadata.type == "operator") {
+    argOutput += parameter;
    if (argOutput != "=" && argOutput != "+" && argOutput != "-" &&
        argOutput != "/" && argOutput != "*") {
      cout << "Warning: Bad operator: Set to = by default." << endl;
@@ -701,55 +630,48 @@ gd::String EventsCodeGenerator::GenerateParameterCodes(
    }

    argOutput = "\"" + argOutput + "\"";
-  } else if (ParameterMetadata::IsBehavior(metadata.GetType())) {
-    argOutput = GenerateGetBehaviorNameCode(parameter.GetPlainString());
-  } else if (metadata.GetType() == "key") {
-    argOutput = "\"" + ConvertToString(parameter.GetPlainString()) + "\"";
-  } else if (metadata.GetType() == "audioResource" ||
-             metadata.GetType() == "bitmapFontResource" ||
-             metadata.GetType() == "fontResource" ||
-             metadata.GetType() == "imageResource" ||
-             metadata.GetType() == "jsonResource" ||
-             metadata.GetType() == "tilemapResource" ||
-             metadata.GetType() == "tilesetResource" ||
-             metadata.GetType() == "videoResource" ||
-             metadata.GetType() == "model3DResource" ||
+  } else if (ParameterMetadata::IsBehavior(metadata.type)) {
+    argOutput = GenerateGetBehaviorNameCode(parameter);
+  } else if (metadata.type == "key") {
+    argOutput = "\"" + ConvertToString(parameter) + "\"";
+  } else if (metadata.type == "audioResource" ||
+             metadata.type == "bitmapFontResource" ||
+             metadata.type == "fontResource" ||
+             metadata.type == "imageResource" ||
+             metadata.type == "jsonResource" ||
+             metadata.type == "videoResource" ||
             // Deprecated, old parameter names:
-             metadata.GetType() == "password" || metadata.GetType() == "musicfile" ||
-             metadata.GetType() == "soundfile" || metadata.GetType() == "police") {
-    argOutput = "\"" + ConvertToString(parameter.GetPlainString()) + "\"";
-  } else if (metadata.GetType() == "mouse") {
-    argOutput = "\"" + ConvertToString(parameter.GetPlainString()) + "\"";
-  } else if (metadata.GetType() == "yesorno") {
-    auto parameterString = parameter.GetPlainString();
-    argOutput += (parameterString == "yes" || parameterString == "oui")
-                     ? GenerateTrue()
-                     : GenerateFalse();
-  } else if (metadata.GetType() == "trueorfalse") {
-    auto parameterString = parameter.GetPlainString();
+             metadata.type == "password" || metadata.type == "musicfile" ||
+             metadata.type == "soundfile" || metadata.type == "police") {
+    argOutput = "\"" + ConvertToString(parameter) + "\"";
+  } else if (metadata.type == "mouse") {
+    argOutput = "\"" + ConvertToString(parameter) + "\"";
+  } else if (metadata.type == "yesorno") {
+    argOutput += (parameter == "yes" || parameter == "oui") ? GenerateTrue()
+                                                            : GenerateFalse();
+  } else if (metadata.type == "trueorfalse") {
    // This is duplicated in AdvancedExtension.cpp for GDJS
-    argOutput += (parameterString == "True" || parameterString == "Vrai")
-                     ? GenerateTrue()
-                     : GenerateFalse();
+    argOutput += (parameter == "True" || parameter == "Vrai") ? GenerateTrue()
+                                                              : GenerateFalse();
  }
  // Code only parameter type
-  else if (metadata.GetType() == "inlineCode") {
-    argOutput += metadata.GetExtraInfo();
+  else if (metadata.type == "inlineCode") {
+    argOutput += metadata.supplementaryInformation;
  } else {
    // Try supplementary types if provided
    if (supplementaryParametersTypes) {
      for (std::size_t i = 0; i < supplementaryParametersTypes->size(); ++i) {
-        if ((*supplementaryParametersTypes)[i].first == metadata.GetType())
+        if ((*supplementaryParametersTypes)[i].first == metadata.type)
          argOutput += (*supplementaryParametersTypes)[i].second;
      }
    }

    // Type unknown
    if (argOutput.empty()) {
-      if (!metadata.GetType().empty())
-        cout << "Warning: Unknown type of parameter \"" << metadata.GetType()
+      if (!metadata.type.empty())
+        cout << "Warning: Unknown type of parameter \"" << metadata.type
             << "\"." << std::endl;
-      argOutput += "\"" + ConvertToString(parameter.GetPlainString()) + "\"";
+      argOutput += "\"" + ConvertToString(parameter) + "\"";
    }
  }

@@ -769,7 +691,7 @@ vector<gd::String> EventsCodeGenerator::GenerateParametersCodes(
      parametersInfo,
      [this, &context, &supplementaryParametersTypes, &arguments](
          const gd::ParameterMetadata& parameterMetadata,
-          const gd::Expression& parameterValue,
+          const gd::String& parameterValue,
          const gd::String& lastObjectName) {
        gd::String argOutput =
            GenerateParameterCodes(parameterValue,
@@ -821,21 +743,23 @@ gd::String EventsCodeGenerator::GenerateObjectsDeclarationCode(
  gd::String declarationsCode;
  for (auto object : context.GetObjectsListsToBeDeclared()) {
    gd::String objectListDeclaration = "";
-    if (!context.ObjectAlreadyDeclaredByParents(object)) {
+    if (!context.ObjectAlreadyDeclared(object)) {
      objectListDeclaration = "std::vector<RuntimeObject*> " +
                              GetObjectListName(object, context) +
                              " = runtimeContext->GetObjectsRawPointers(\"" +
                              ConvertToString(object) + "\");\n";
+      context.SetObjectDeclared(object);
    } else
      objectListDeclaration = declareObjectList(object, context);

    declarationsCode += objectListDeclaration + "\n";
  }
-  for (auto object : context.GetObjectsListsToBeEmptyIfJustDeclared()) {
+  for (auto object : context.GetObjectsListsToBeDeclaredWithoutPicking()) {
    gd::String objectListDeclaration = "";
-    if (!context.ObjectAlreadyDeclaredByParents(object)) {
+    if (!context.ObjectAlreadyDeclared(object)) {
      objectListDeclaration = "std::vector<RuntimeObject*> " +
                              GetObjectListName(object, context) + ";\n";
+      context.SetObjectDeclared(object);
    } else
      objectListDeclaration = declareObjectList(object, context);

@@ -843,9 +767,10 @@ gd::String EventsCodeGenerator::GenerateObjectsDeclarationCode(
  }
  for (auto object : context.GetObjectsListsToBeDeclaredEmpty()) {
    gd::String objectListDeclaration = "";
-    if (!context.ObjectAlreadyDeclaredByParents(object)) {
+    if (!context.ObjectAlreadyDeclared(object)) {
      objectListDeclaration = "std::vector<RuntimeObject*> " +
                              GetObjectListName(object, context) + ";\n";
+      context.SetObjectDeclared(object);
    } else
      objectListDeclaration = "std::vector<RuntimeObject*> " +
                              GetObjectListName(object, context) + ";\n";
@@ -860,7 +785,7 @@ gd::String EventsCodeGenerator::GenerateObjectsDeclarationCode(
 * Generate events list code.
 */
 gd::String EventsCodeGenerator::GenerateEventsListCode(
-    gd::EventsList& events, EventsCodeGenerationContext& parentContext) {
+    gd::EventsList& events, const EventsCodeGenerationContext& parentContext) {
  gd::String output;
  for (std::size_t eId = 0; eId < events.size(); ++eId) {
    // Each event has its own context : Objects picked in an event are totally
@@ -876,8 +801,6 @@ gd::String EventsCodeGenerator::GenerateEventsListCode(
    // operation.
    bool reuseParentContext =
        parentContext.CanReuse() && eId == events.size() - 1;
-
-    // TODO: avoid creating if useless.
    gd::EventsCodeGenerationContext reusedContext;
    reusedContext.Reuse(parentContext);

@@ -909,6 +832,41 @@ gd::String EventsCodeGenerator::ConvertToStringExplicit(
  return "\"" + ConvertToString(plainString) + "\"";
 }

+std::vector<gd::String> EventsCodeGenerator::ExpandObjectsName(
+    const gd::String& objectName,
+    const EventsCodeGenerationContext& context) const {
+  // Note: this logic is duplicated in EventsContextAnalyzer::ExpandObjectsName
+  std::vector<gd::String> realObjects;
+  if (globalObjectsAndGroups.GetObjectGroups().Has(objectName))
+    realObjects = globalObjectsAndGroups.GetObjectGroups()
+                      .Get(objectName)
+                      .GetAllObjectsNames();
+  else if (objectsAndGroups.GetObjectGroups().Has(objectName))
+    realObjects =
+        objectsAndGroups.GetObjectGroups().Get(objectName).GetAllObjectsNames();
+  else
+    realObjects.push_back(objectName);
+
+  // If current object is present, use it and only it.
+  if (find(realObjects.begin(),
+           realObjects.end(),
+           context.GetCurrentObject()) != realObjects.end()) {
+    realObjects.clear();
+    realObjects.push_back(context.GetCurrentObject());
+  }
+
+  // Ensure that all returned objects actually exists.
+  for (std::size_t i = 0; i < realObjects.size();) {
+    if (!objectsAndGroups.HasObjectNamed(realObjects[i]) &&
+        !globalObjectsAndGroups.HasObjectNamed(realObjects[i]))
+      realObjects.erase(realObjects.begin() + i);
+    else
+      ++i;
+  }
+
+  return realObjects;
+}
+
 void EventsCodeGenerator::DeleteUselessEvents(gd::EventsList& events) {
  for (std::size_t eId = events.size() - 1; eId < events.size(); --eId) {
    if (events[eId].CanHaveSubEvents())  // Process sub events, if any
@@ -925,8 +883,6 @@ void EventsCodeGenerator::DeleteUselessEvents(gd::EventsList& events) {
 */
 void EventsCodeGenerator::PreprocessEventList(gd::EventsList& listEvent) {
  for (std::size_t i = 0; i < listEvent.GetEventsCount(); ++i) {
-    if (listEvent[i].IsDisabled()) continue;
-
    listEvent[i].Preprocess(*this, listEvent, i);
    if (i <
        listEvent.GetEventsCount()) {  // Be sure that that there is still an
@@ -972,15 +928,15 @@ gd::String EventsCodeGenerator::GenerateFreeCondition(
    bool conditionInverted,
    gd::EventsCodeGenerationContext& context) {
  // Generate call
-  gd::String predicate;
+  gd::String predicat;
  if (instrInfos.codeExtraInformation.type == "number" ||
      instrInfos.codeExtraInformation.type == "string") {
-    predicate = GenerateRelationalOperatorCall(
+    predicat = GenerateRelationalOperatorCall(
        instrInfos,
        arguments,
        instrInfos.codeExtraInformation.functionCallName);
  } else {
-    predicate = instrInfos.codeExtraInformation.functionCallName + "(" +
+    predicat = instrInfos.codeExtraInformation.functionCallName + "(" +
               GenerateArgumentsList(arguments, 0) + ")";
  }

@@ -989,14 +945,14 @@ gd::String EventsCodeGenerator::GenerateFreeCondition(
  for (std::size_t i = 0; i < instrInfos.parameters.size();
       ++i)  // Some conditions already have a "conditionInverted" parameter
  {
-    if (instrInfos.parameters[i].GetType() == "conditionInverted")
+    if (instrInfos.parameters[i].type == "conditionInverted")
      conditionAlreadyTakeCareOfInversion = true;
  }
  if (!conditionAlreadyTakeCareOfInversion && conditionInverted)
-    predicate = GenerateNegatedPredicate(predicate);
+    predicat = GenerateNegatedPredicat(predicat);

  // Generate condition code
-  return returnBoolean + " = " + predicate + ";\n";
+  return returnBoolean + " = " + predicat + ";\n";
 }

 gd::String EventsCodeGenerator::GenerateObjectCondition(
@@ -1010,7 +966,7 @@ gd::String EventsCodeGenerator::GenerateObjectCondition(
  // Prepare call
  // Add a static_cast if necessary
  gd::String objectFunctionCallNamePart =
-      (!instrInfos.parameters[0].GetExtraInfo().empty())
+      (!instrInfos.parameters[0].supplementaryInformation.empty())
          ? "static_cast<" + objInfo.className + "*>(" +
                GetObjectListName(objectName, context) + "[i])->" +
                instrInfos.codeExtraInformation.functionCallName
@@ -1018,18 +974,18 @@ gd::String EventsCodeGenerator::GenerateObjectCondition(
                instrInfos.codeExtraInformation.functionCallName;

  // Create call
-  gd::String predicate;
+  gd::String predicat;
  if ((instrInfos.codeExtraInformation.type == "number" ||
       instrInfos.codeExtraInformation.type == "string")) {
-    predicate = GenerateRelationalOperatorCall(
+    predicat = GenerateRelationalOperatorCall(
        instrInfos, arguments, objectFunctionCallNamePart, 1);
  } else {
-    predicate = objectFunctionCallNamePart + "(" +
+    predicat = objectFunctionCallNamePart + "(" +
               GenerateArgumentsList(arguments, 1) + ")";
  }
-  if (conditionInverted) predicate = GenerateNegatedPredicate(predicate);
+  if (conditionInverted) predicat = GenerateNegatedPredicat(predicat);

-  return "For each picked object \"" + objectName + "\", check " + predicate +
+  return "For each picked object \"" + objectName + "\", check " + predicat +
         ".\n";
 }

@@ -1043,25 +999,23 @@ gd::String EventsCodeGenerator::GenerateBehaviorCondition(
    bool conditionInverted,
    gd::EventsCodeGenerationContext& context) {
  // Create call
-  gd::String predicate;
+  gd::String predicat;
  if ((instrInfos.codeExtraInformation.type == "number" ||
       instrInfos.codeExtraInformation.type == "string")) {
-    predicate = GenerateRelationalOperatorCall(instrInfos, arguments, "", 2);
+    predicat = GenerateRelationalOperatorCall(instrInfos, arguments, "", 2);
  } else {
-    predicate = "(" + GenerateArgumentsList(arguments, 2) + ")";
+    predicat = "(" + GenerateArgumentsList(arguments, 2) + ")";
  }
-  if (conditionInverted) predicate = GenerateNegatedPredicate(predicate);
+  if (conditionInverted) predicat = GenerateNegatedPredicat(predicat);

-  return "For each picked object \"" + objectName + "\", check " + predicate +
+  return "For each picked object \"" + objectName + "\", check " + predicat +
         " for behavior \"" + behaviorName + "\".\n";
 }

 gd::String EventsCodeGenerator::GenerateFreeAction(
-      const gd::String& functionCallName,
    const std::vector<gd::String>& arguments,
    const gd::InstructionMetadata& instrInfos,
-    gd::EventsCodeGenerationContext& context,
-    const gd::String& optionalAsyncCallbackName) {
+    gd::EventsCodeGenerationContext& context) {
  // Generate call
  gd::String call;
  if (instrInfos.codeExtraInformation.type == "number" ||
@@ -1071,39 +1025,32 @@ gd::String EventsCodeGenerator::GenerateFreeAction(
      call = GenerateOperatorCall(
          instrInfos,
          arguments,
-          functionCallName,
+          instrInfos.codeExtraInformation.functionCallName,
          instrInfos.codeExtraInformation.optionalAssociatedInstruction);
    else if (instrInfos.codeExtraInformation.accessType ==
             gd::InstructionMetadata::ExtraInformation::Mutators)
      call =
          GenerateMutatorCall(instrInfos,
                              arguments,
-                              functionCallName);
+                              instrInfos.codeExtraInformation.functionCallName);
    else
      call = GenerateCompoundOperatorCall(
          instrInfos,
          arguments,
-          functionCallName);
+          instrInfos.codeExtraInformation.functionCallName);
  } else {
-    call = functionCallName + "(" +
+    call = instrInfos.codeExtraInformation.functionCallName + "(" +
           GenerateArgumentsList(arguments) + ")";
  }
-
-  if (!optionalAsyncCallbackName.empty())
-    call = "runtimeScene.getAsyncTasksManager().addTask(" + call + ", " +
-           optionalAsyncCallbackName + ")";
-
  return call + ";\n";
 }

 gd::String EventsCodeGenerator::GenerateObjectAction(
    const gd::String& objectName,
    const gd::ObjectMetadata& objInfo,
-    const gd::String& functionCallName,
    const std::vector<gd::String>& arguments,
    const gd::InstructionMetadata& instrInfos,
-    gd::EventsCodeGenerationContext& context,
-    const gd::String& optionalAsyncCallbackName) {
+    gd::EventsCodeGenerationContext& context) {
  // Create call
  gd::String call;
  if ((instrInfos.codeExtraInformation.type == "number" ||
@@ -1113,26 +1060,25 @@ gd::String EventsCodeGenerator::GenerateObjectAction(
      call = GenerateOperatorCall(
          instrInfos,
          arguments,
-          functionCallName,
+          instrInfos.codeExtraInformation.functionCallName,
          instrInfos.codeExtraInformation.optionalAssociatedInstruction,
          2);
    else
      call = GenerateCompoundOperatorCall(
-          instrInfos, arguments, functionCallName, 2);
+          instrInfos,
+          arguments,
+          instrInfos.codeExtraInformation.functionCallName,
+          2);

    return "For each picked object \"" + objectName + "\", call " + call +
           ".\n";
  } else {
    gd::String argumentsStr = GenerateArgumentsList(arguments, 1);

-    call = functionCallName + "(" + argumentsStr + ")";
-
+    call = instrInfos.codeExtraInformation.functionCallName + "(" +
+           argumentsStr + ")";
    return "For each picked object \"" + objectName + "\", call " + call + "(" +
-           argumentsStr + ")" +
-           (optionalAsyncCallbackName.empty()
-                ? ""
-                : (", then call" + optionalAsyncCallbackName)) +
-           ".\n";
+           argumentsStr + ").\n";
  }
 }

@@ -1140,11 +1086,9 @@ gd::String EventsCodeGenerator::GenerateBehaviorAction(
    const gd::String& objectName,
    const gd::String& behaviorName,
    const gd::BehaviorMetadata& autoInfo,
-    const gd::String& functionCallName,
    const std::vector<gd::String>& arguments,
    const gd::InstructionMetadata& instrInfos,
-    gd::EventsCodeGenerationContext& context,
-    const gd::String& optionalAsyncCallbackName) {
+    gd::EventsCodeGenerationContext& context) {
  // Create call
  gd::String call;
  if ((instrInfos.codeExtraInformation.type == "number" ||
@@ -1154,29 +1098,24 @@ gd::String EventsCodeGenerator::GenerateBehaviorAction(
      call = GenerateOperatorCall(
          instrInfos,
          arguments,
-          functionCallName,
+          instrInfos.codeExtraInformation.functionCallName,
          instrInfos.codeExtraInformation.optionalAssociatedInstruction,
          2);
    else
      call = GenerateCompoundOperatorCall(
          instrInfos,
          arguments,
-          functionCallName,
+          instrInfos.codeExtraInformation.functionCallName,
          2);
    return "For each picked object \"" + objectName + "\", call " + call +
           " for behavior \"" + behaviorName + "\".\n";
  } else {
    gd::String argumentsStr = GenerateArgumentsList(arguments, 2);

-    call = functionCallName + "(" +
+    call = instrInfos.codeExtraInformation.functionCallName + "(" +
           argumentsStr + ")";
-
    return "For each picked object \"" + objectName + "\", call " + call + "(" +
-           argumentsStr + ")" + " for behavior \"" + behaviorName + "\"" +
-           (optionalAsyncCallbackName.empty()
-                ? ""
-                : (", then call" + optionalAsyncCallbackName)) +
-           ".\n";
+           argumentsStr + ")" + " for behavior \"" + behaviorName + "\".\n";
  }
 }

@@ -1192,7 +1131,7 @@ size_t EventsCodeGenerator::GenerateSingleUsageUniqueIdFor(
              << std::endl;
  }

-  // Base the unique id on the address in memory so that the same instruction
+  // Base the unique id on the adress in memory so that the same instruction
  // in memory will get the same id across different code generations.
  size_t uniqueId = (size_t)instruction;

@@ -1224,24 +1163,12 @@ gd::String EventsCodeGenerator::GenerateArgumentsList(
  return argumentsStr;
 }

-gd::String EventsCodeGenerator::GeneratePropertyGetter(const gd::PropertiesContainer& propertiesContainer,
-                                                       const gd::NamedPropertyDescriptor& property,
-                                                       const gd::String& type,
-                                                       gd::EventsCodeGenerationContext& context) {
-  return "getProperty" + property.GetName() + "As" + type + "()";
-}
-
-gd::String EventsCodeGenerator::GenerateParameterGetter(const gd::ParameterMetadata& parameter,
-                                                        const gd::String& type,
-                                                        gd::EventsCodeGenerationContext& context) {
-  return "getParameter" + parameter.GetName() + "As" + type + "()";
-}
-
-EventsCodeGenerator::EventsCodeGenerator(const gd::Project& project_,
+EventsCodeGenerator::EventsCodeGenerator(gd::Project& project_,
                                         const gd::Layout& layout,
                                         const gd::Platform& platform_)
    : platform(platform_),
-      projectScopedContainers(gd::ProjectScopedContainers::MakeNewProjectScopedContainersForProjectAndLayout(project_, layout)),
+      globalObjectsAndGroups(project_),
+      objectsAndGroups(layout),
      hasProjectAndLayout(true),
      project(&project_),
      scene(&layout),
@@ -1253,9 +1180,11 @@ EventsCodeGenerator::EventsCodeGenerator(const gd::Project& project_,

 EventsCodeGenerator::EventsCodeGenerator(
    const gd::Platform& platform_,
-    const gd::ProjectScopedContainers& projectScopedContainers_)
+    gd::ObjectsContainer& globalObjectsAndGroups_,
+    const gd::ObjectsContainer& objectsAndGroups_)
    : platform(platform_),
-      projectScopedContainers(projectScopedContainers_),
+      globalObjectsAndGroups(globalObjectsAndGroups_),
+      objectsAndGroups(objectsAndGroups_),
      hasProjectAndLayout(false),
      project(nullptr),
      scene(nullptr),
--- a/Core/GDCore/Events/CodeGeneration/EventsCodeGenerator.h
+++ b/Core/GDCore/Events/CodeGeneration/EventsCodeGenerator.h
@@ -12,7 +12,6 @@

 #include "GDCore/Events/Event.h"
 #include "GDCore/Events/Instruction.h"
-#include "GDCore/Project/ProjectScopedContainers.h"
 #include "GDCore/String.h"
 namespace gd {
 class EventsList;
@@ -20,7 +19,6 @@ class Expression;
 class Project;
 class Layout;
 class ObjectsContainer;
-class ObjectsContainersList;
 class ExternalEvents;
 class ParameterMetadata;
 class ObjectMetadata;
@@ -50,7 +48,7 @@ class GD_CORE_API EventsCodeGenerator {
   * \brief Construct a code generator for the specified
   * platform/project/layout.
   */
-  EventsCodeGenerator(const gd::Project& project_,
+  EventsCodeGenerator(gd::Project& project_,
                      const gd::Layout& layout,
                      const gd::Platform& platform_);

@@ -58,9 +56,9 @@ class GD_CORE_API EventsCodeGenerator {
   * \brief Construct a code generator for the specified
   * objects/groups and platform
   */
-  EventsCodeGenerator(
-      const gd::Platform& platform,
-      const gd::ProjectScopedContainers& projectScopedContainers_);
+  EventsCodeGenerator(const gd::Platform& platform,
+                      gd::ObjectsContainer& globalObjectsAndGroups_,
+                      const gd::ObjectsContainer& objectsAndGroups_);
  virtual ~EventsCodeGenerator(){};

  /**
@@ -79,7 +77,7 @@ class GD_CORE_API EventsCodeGenerator {
   * \return Code
   */
  virtual gd::String GenerateEventsListCode(
-      gd::EventsList& events, EventsCodeGenerationContext& context);
+      gd::EventsList& events, const EventsCodeGenerationContext& context);

  /**
   * \brief Generate code for executing a condition list
@@ -156,54 +154,8 @@ class GD_CORE_API EventsCodeGenerator {
   * \param context Context used for generation
   * \return Code
   */
-  gd::String GenerateActionCode(
-      gd::Instruction& action,
-      EventsCodeGenerationContext& context,
-      const gd::String& optionalAsyncCallbackName = "");
-
-  struct CallbackDescriptor {
-    CallbackDescriptor(const gd::String functionName_,
-                       const gd::String argumentsList_,
-                       const std::set<gd::String> requiredObjects_)
-        : functionName(functionName_),
-          argumentsList(argumentsList_),
-          requiredObjects(requiredObjects_){};
-    /**
-     * The name by which the function can be invoked.
-     */
-    const gd::String functionName;
-    /**
-     * The comma separated list of arguments that the function takes.
-     */
-    const gd::String argumentsList;
-    /**
-     * A set of all objects that need to be backed up to be passed to the
-     * callback code.
-     */
-    const std::set<gd::String> requiredObjects;
-  };
-
-  /**
-   * \brief Generates actions and events as a callback.
-   *
-   * This is used by asynchronous functions to run the code out of the normal
-   * events flow.
-   *
-   * \returns A set with all objects required by the callback code.
-   * The caller must take care of backing them up in a LongLivedObjectsList,
-   * and to pass it to the callback function as the last argument.
-   */
-  virtual const CallbackDescriptor GenerateCallback(
-      const gd::String& callbackFunctionName,
-      gd::EventsCodeGenerationContext& parentContext,
-      gd::InstructionsList& actions,
-      gd::EventsList* subEvents = nullptr);
-
-  /**
-   * \brief Generates the parameters list of an event's generated function.
-   */
-  const gd::String GenerateEventsParameters(
-      const gd::EventsCodeGenerationContext& context);
+  gd::String GenerateActionCode(gd::Instruction& action,
+                                EventsCodeGenerationContext& context);

  /**
   * \brief Generate code for declaring objects lists.
@@ -328,12 +280,18 @@ class GD_CORE_API EventsCodeGenerator {
   */
  bool ErrorOccurred() const { return errorOccurred; };

-  const gd::ObjectsContainersList& GetObjectsContainersList() const {
-    return projectScopedContainers.GetObjectsContainersList();
-  };
+  /**
+   * \brief Get the global objects/groups used for code generation.
+   */
+  gd::ObjectsContainer& GetGlobalObjectsAndGroups() const {
+    return globalObjectsAndGroups;
+  }

-  const gd::ProjectScopedContainers& GetProjectScopedContainers() const {
-    return projectScopedContainers;
+  /**
+   * \brief Get the objects/groups used for code generation.
+   */
+  const gd::ObjectsContainer& GetObjectsAndGroups() const {
+    return objectsAndGroups;
  }

  /**
@@ -346,7 +304,7 @@ class GD_CORE_API EventsCodeGenerator {
   * \brief Get the project the code is being generated for.
   * \warning This is only valid if HasProjectAndLayout() is true.
   */
-  const gd::Project& GetProject() const { return *project; }
+  gd::Project& GetProject() const { return *project; }

  /**
   * \brief Get the layout the code is being generated for.
@@ -359,6 +317,22 @@ class GD_CORE_API EventsCodeGenerator {
   */
  const gd::Platform& GetPlatform() const { return platform; }

+  /**
+   * \brief Convert a group name to the full list of objects contained in the
+   * group.
+   *
+   * Get a list containing the "real" objects name when the events refers to \a
+   * objectName :<br> If \a objectName is really an object, the list will only
+   * contains \a objectName unchanged.<br> If \a objectName is a group, the list
+   * will contains all the objects of the group.<br> If \a objectName is the
+   * "current" object in the context ( i.e: The object being used for launching
+   * an action... ), none of the two rules below apply, and the list will only
+   * contains the context "current" object name.
+   */
+  std::vector<gd::String> ExpandObjectsName(
+      const gd::String& objectName,
+      const EventsCodeGenerationContext& context) const;
+
  /**
   * \brief Get the maximum depth of custom conditions reached during code
   * generation.
@@ -384,18 +358,6 @@ class GD_CORE_API EventsCodeGenerator {
    return boolName;
  }

-  /**
-   * \brief Generate the full name for accessing to a boolean variable used for
-   * conditions.
-   *
-   * Default implementation just returns the boolean name passed as argument.
-   */
-  virtual gd::String GenerateUpperScopeBooleanFullName(
-      const gd::String& boolName,
-      const gd::EventsCodeGenerationContext& context) {
-    return boolName;
-  }
-
  /**
   * \brief Must create a boolean. Its value must be false.
   *
@@ -473,15 +435,7 @@ class GD_CORE_API EventsCodeGenerator {
   */
  size_t GenerateSingleUsageUniqueIdForEventsList();

-  virtual gd::String GenerateRelationalOperation(
-      const gd::String& relationalOperator,
-      const gd::String& lhs,
-      const gd::String& rhs);
-
 protected:
-  virtual const gd::String GenerateRelationalOperatorCodes(
-      const gd::String& operatorString);
-
  /**
   * \brief Generate the code for a single parameter.
   *
@@ -490,9 +444,9 @@ class GD_CORE_API EventsCodeGenerator {
   * - object : Object name -> string
   * - expression : Mathematical expression -> number (double)
   * - string : %Text expression -> string
-   * - layer, color, file, stringWithSelector : Same as string
+   * - layer, color, file, joyaxis : Same as string
   * - relationalOperator : Used to make a comparison between the function
-  return value and value of the parameter preceding the relationOperator
+  resturn value and value of the parameter preceding the relationOperator
  parameter -> string
   * - operator : Used to update a value using a setter and a getter -> string
   * - key, mouse, objectvar, scenevar, globalvar, password, musicfile,
@@ -508,18 +462,25 @@ class GD_CORE_API EventsCodeGenerator {
   * Other standard parameters type that should be implemented by platforms:
   * - currentScene: Reference to the current runtime scene.
   * - objectList : a map containing lists of objects which are specified by the
-  object name in another parameter.
-   * - objectListOrEmptyIfJustDeclared : Same as `objectList` but do not pick
-  object if they are not already picked.
-   * - objectPtr: Return a reference to the object specified by the object name
-  in another parameter. Example:
+  object name in another parameter. Example:
+   * \code
+      AddExpression("Count", _("Object count"), _("Count the number of picked
+  objects"), _("Objects"), "res/conditions/nbObjet.png")
+      .AddParameter("objectList", _("Object"))
+      .SetFunctionName("getPickedObjectsCount");
+
+   * \endcode
+   * - objectListWithoutPicking : Same as objectList but do not pick object if
+  they are not already picked.
+   * - objectPtr : Return a reference to the object specified by the object name in
+  another parameter. Example:
   * \code
  .AddParameter("object", _("Object"))
  .AddParameter("objectPtr", _("Target object"))
   * \endcode
   */
  virtual gd::String GenerateParameterCodes(
-      const gd::Expression& parameter,
+      const gd::String& parameter,
      const gd::ParameterMetadata& metadata,
      gd::EventsCodeGenerationContext& context,
      const gd::String& lastObjectName,
@@ -551,12 +512,6 @@ class GD_CORE_API EventsCodeGenerator {
    return ".getChild(" + ConvertToStringExplicit(childName) + ")";
  };

-  virtual gd::String GenerateVariableValueAs(const gd::String& type) {
-    return type == "number|string" ? ".getAsNumberOrString()"
-           : type == "string"      ? ".getAsString()"
-                                   : ".getAsNumber()";
-  }
-
  /**
   * \brief Generate the code to get the child of a variable,
   * using generated the expression.
@@ -585,17 +540,6 @@ class GD_CORE_API EventsCodeGenerator {
    return "fakeObjectListOf_" + objectName;
  }

-  virtual gd::String GeneratePropertyGetter(
-      const gd::PropertiesContainer& propertiesContainer,
-      const gd::NamedPropertyDescriptor& property,
-      const gd::String& type,
-      gd::EventsCodeGenerationContext& context);
-
-  virtual gd::String GenerateParameterGetter(
-      const gd::ParameterMetadata& parameter,
-      const gd::String& type,
-      gd::EventsCodeGenerationContext& context);
-
  /**
   * \brief Generate the code to reference an object which is
   * in an empty/null state.
@@ -670,16 +614,28 @@ class GD_CORE_API EventsCodeGenerator {
  };

  /**
-   * \brief Must negate a predicate.
+   * \brief Must negate a predicat.
   *
-   * The default implementation generates C-style code : It wraps the predicate
+   * The default implementation generates C-style code : It wraps the predicat
   * inside parenthesis and add a !.
   */
-  virtual gd::String GenerateNegatedPredicate(
-      const gd::String& predicate) const {
-    return "!(" + predicate + ")";
+  virtual gd::String GenerateNegatedPredicat(const gd::String& predicat) const {
+    return "!(" + predicat + ")";
  };

+  /**
+   * \brief Must create a boolean which is a reference to a boolean declared in
+   * the parent scope.
+   *
+   * The default implementation generates C-style code.
+   */
+  virtual gd::String GenerateReferenceToUpperScopeBoolean(
+      const gd::String& referenceName,
+      const gd::String& referencedBoolean,
+      gd::EventsCodeGenerationContext& context) {
+    return "bool & " + referenceName + " = " + referencedBoolean + ";\n";
+  }
+
  virtual gd::String GenerateFreeCondition(
      const std::vector<gd::String>& arguments,
      const gd::InstructionMetadata& instrInfos,
@@ -707,37 +663,30 @@ class GD_CORE_API EventsCodeGenerator {
      gd::EventsCodeGenerationContext& context);

  virtual gd::String GenerateFreeAction(
-      const gd::String& functionCallName,
      const std::vector<gd::String>& arguments,
      const gd::InstructionMetadata& instrInfos,
-      gd::EventsCodeGenerationContext& context,
-      const gd::String& optionalAsyncCallbackName = "");
+      gd::EventsCodeGenerationContext& context);

  virtual gd::String GenerateObjectAction(
      const gd::String& objectName,
      const gd::ObjectMetadata& objInfo,
-      const gd::String& functionCallName,
      const std::vector<gd::String>& arguments,
      const gd::InstructionMetadata& instrInfos,
-      gd::EventsCodeGenerationContext& context,
-      const gd::String& optionalAsyncCallbackName = "");
+      gd::EventsCodeGenerationContext& context);

  virtual gd::String GenerateBehaviorAction(
      const gd::String& objectName,
      const gd::String& behaviorName,
      const gd::BehaviorMetadata& autoInfo,
-      const gd::String& functionCallName,
      const std::vector<gd::String>& arguments,
      const gd::InstructionMetadata& instrInfos,
-      gd::EventsCodeGenerationContext& context,
-      const gd::String& optionalAsyncCallbackName = "");
+      gd::EventsCodeGenerationContext& context);

  gd::String GenerateRelationalOperatorCall(
      const gd::InstructionMetadata& instrInfos,
      const std::vector<gd::String>& arguments,
      const gd::String& callStartString,
      std::size_t startFromArgument = 0);
-
  gd::String GenerateOperatorCall(const gd::InstructionMetadata& instrInfos,
                                  const std::vector<gd::String>& arguments,
                                  const gd::String& callStartString,
@@ -781,14 +730,15 @@ class GD_CORE_API EventsCodeGenerator {

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

-  gd::ProjectScopedContainers projectScopedContainers;
+  gd::ObjectsContainer& globalObjectsAndGroups;
+  const gd::ObjectsContainer& objectsAndGroups;

  bool hasProjectAndLayout;  ///< true only if project and layout are valid
                             ///< references. If false, they should not be used.
-  const gd::Project* project;  ///< The project being used.
-  const gd::Layout* scene;     ///< The scene being generated.
+  gd::Project* project;      ///< The project being used.
+  const gd::Layout* scene;   ///< The scene being generated.

-  bool errorOccurred;          ///< Must be set to true if an error occurred.
+  bool errorOccurred;          ///< Must be set to true if an error occured.
  bool compilationForRuntime;  ///< Is set to true if the code generation is
                               ///< made for runtime only.

--- a/Core/GDCore/Events/CodeGeneration/ExpressionCodeGenerator.cpp
+++ b/Core/GDCore/Events/CodeGeneration/ExpressionCodeGenerator.cpp
@@ -7,7 +7,6 @@

 #include <memory>
 #include <vector>
-#include <vector>

 #include "GDCore/CommonTools.h"
 #include "GDCore/Events/CodeGeneration/EventsCodeGenerationContext.h"
@@ -26,40 +25,36 @@
 #include "GDCore/IDE/Events/ExpressionValidator.h"
 #include "GDCore/Project/Layout.h"
 #include "GDCore/Project/Project.h"
-#include "GDCore/Project/VariablesContainersList.h"
-#include "GDCore/Project/ObjectsContainersList.h"
-#include "GDCore/Project/ProjectScopedContainers.h"
-#include "GDCore/IDE/Events/ExpressionTypeFinder.h"
-#include "GDCore/IDE/Events/ExpressionVariableOwnerFinder.h"

 namespace gd {

 gd::String ExpressionCodeGenerator::GenerateExpressionCode(
    EventsCodeGenerator& codeGenerator,
    EventsCodeGenerationContext& context,
-    const gd::String& rootType,
-    const gd::Expression& expression,
-    const gd::String& rootObjectName) {
-  ExpressionCodeGenerator generator(rootType, rootObjectName, codeGenerator, context);
+    const gd::String& type,
+    const gd::String& expression,
+    const gd::String& objectName) {
+  gd::ExpressionParser2 parser(codeGenerator.GetPlatform(),
+                               codeGenerator.GetGlobalObjectsAndGroups(),
+                               codeGenerator.GetObjectsAndGroups());
+  ExpressionCodeGenerator generator(codeGenerator, context);

-  auto node = expression.GetRootNode();
+  auto node = parser.ParseExpression(type, expression, objectName);
  if (!node) {
-    std::cout << "Error: error while parsing: \"" << expression.GetPlainString()
-              << "\" (" << rootType << ")" << std::endl;
+    std::cout << "Error: error while parsing: \"" << expression << "\" ("
+              << type << ")" << std::endl;

-    return generator.GenerateDefaultValue(rootType);
+    return generator.GenerateDefaultValue(type);
  }

-  gd::ExpressionValidator validator(codeGenerator.GetPlatform(),
-                                    codeGenerator.GetProjectScopedContainers(),
-                                    rootType);
+  gd::ExpressionValidator validator;
  node->Visit(validator);
-  if (!validator.GetFatalErrors().empty()) {
-    std::cout << "Error: \"" << validator.GetFatalErrors()[0]->GetMessage()
-              << "\" in: \"" << expression.GetPlainString() << "\" ("
-              << rootType << ")" << std::endl;
+  if (!validator.GetErrors().empty()) {
+    std::cout << "Error: \"" << validator.GetErrors()[0]->GetMessage()
+              << "\" in: \"" << expression << "\" (" << type << ")"
+              << std::endl;

-    return generator.GenerateDefaultValue(rootType);
+    return generator.GenerateDefaultValue(type);
  }

  node->Visit(generator);
@@ -102,96 +97,27 @@ void ExpressionCodeGenerator::OnVisitTextNode(TextNode& node) {
 void ExpressionCodeGenerator::OnVisitVariableNode(VariableNode& node) {
  // This "translation" from the type to an enum could be avoided
  // if all types were moved to an enum.
-  auto type = gd::ExpressionTypeFinder::GetType(codeGenerator.GetPlatform(),
-                                            codeGenerator.GetProjectScopedContainers(),
-                                            rootType,
-                                            node);
+  EventsCodeGenerator::VariableScope scope =
+      node.type == "globalvar"
+          ? gd::EventsCodeGenerator::PROJECT_VARIABLE
+          : ((node.type == "scenevar")
+                 ? gd::EventsCodeGenerator::LAYOUT_VARIABLE
+                 : gd::EventsCodeGenerator::OBJECT_VARIABLE);

-  if (gd::ParameterMetadata::IsExpression("variable", type)) {
-    // The node is a variable inside an expression waiting for a *variable* to be returned, not its value.
-    EventsCodeGenerator::VariableScope scope =
-        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);
-    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.
-
-    codeGenerator.GetProjectScopedContainers().MatchIdentifierWithName<void>(node.name, [&](){
-      // Generate the code to access the object variables.
-
-      // Defer generation of the access to the object and variable to the child,
-      // once we know the name of the variable.
-      objectNameToUseForVariableAccessor = node.name;
-      if (node.child) node.child->Visit(*this);
-      objectNameToUseForVariableAccessor = "";
-
-      output += codeGenerator.GenerateVariableValueAs(type);
-    }, [&]() {
-      if (!codeGenerator.HasProjectAndLayout()) {
-        gd::LogWarning("Tried to generate access to a variable without a project/scene - the code generator only works for global and scene variables for now.");
-        output += GenerateDefaultValue(type);
-        return;
-      }
-
-      // This could be adapted in the future if more scopes are supported.
-      EventsCodeGenerator::VariableScope scope = gd::EventsCodeGenerator::PROJECT_VARIABLE;
-      if (codeGenerator.GetProjectScopedContainers().GetVariablesContainersList().GetBottomMostVariablesContainer()->Has(node.name)) {
-        scope = gd::EventsCodeGenerator::LAYOUT_VARIABLE;
-      }
-
-      output += codeGenerator.GenerateGetVariable(node.name, scope, context, "");
-      if (node.child) node.child->Visit(*this);
-      output += codeGenerator.GenerateVariableValueAs(type);
-    }, [&]() {
-      // Properties are not supported.
-      output += GenerateDefaultValue(type);
-    }, [&]() {
-      // Parameters are not supported.
-      output += GenerateDefaultValue(type);
-    }, [&]() {
-      // The identifier does not represents a variable (or a child variable), or not at least an existing
-      // one, nor an object variable. It's invalid.
-      output += GenerateDefaultValue(type);
-    });
-  }
+  output += codeGenerator.GenerateGetVariable(
+      node.name, scope, context, node.objectName);
+  if (node.child) node.child->Visit(*this);
 }

 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);
-
-      // We have accessed an object variable, from now we can continue accessing the child variables
-      // (including using the bracket notation).
-      objectNameToUseForVariableAccessor = "";
-    } else {
-        output += codeGenerator.GenerateVariableAccessor(node.name);
-    }
+  output += codeGenerator.GenerateVariableAccessor(node.name);
  if (node.child) node.child->Visit(*this);
 }

 void ExpressionCodeGenerator::OnVisitVariableBracketAccessorNode(
    VariableBracketAccessorNode& node) {
-  if (!objectNameToUseForVariableAccessor.empty()) {
-    // Bracket notation can't be used to directly access a variable of an object (`MyObject["MyVariable"]`).
-    // This would be rejected by the ExpressionValidator.
-    output += codeGenerator.GenerateBadVariable();
-    return;
-  }
-
-  ExpressionCodeGenerator generator("number|string", "", codeGenerator, context);
+  ExpressionCodeGenerator generator(codeGenerator, context);
  node.expression->Visit(generator);
  output +=
      codeGenerator.GenerateVariableBracketAccessor(generator.GetOutput());
@@ -199,108 +125,39 @@ void ExpressionCodeGenerator::OnVisitVariableBracketAccessorNode(
 }

 void ExpressionCodeGenerator::OnVisitIdentifierNode(IdentifierNode& node) {
-  auto type = gd::ExpressionTypeFinder::GetType(codeGenerator.GetPlatform(),
-                                            codeGenerator.GetProjectScopedContainers(),
-                                            rootType,
-                                            node);
-
-  if (gd::ParameterMetadata::IsObject(type)) {
+  if (gd::ParameterMetadata::IsObject(node.type)) {
    output +=
-        codeGenerator.GenerateObject(node.identifierName, type, context);
-  } else if (gd::ParameterMetadata::IsExpression("variable", type)) {
-      EventsCodeGenerator::VariableScope scope =
-          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);
-      }
+        codeGenerator.GenerateObject(node.identifierName, node.type, context);
  } else {
-    const auto& variablesContainersList = codeGenerator.GetProjectScopedContainers().GetVariablesContainersList();
-    const auto& propertiesContainersList = codeGenerator.GetProjectScopedContainers().GetPropertiesContainersList();
-    const auto& parametersVectorsList = codeGenerator.GetProjectScopedContainers().GetParametersVectorsList();
-
-    // The node represents a variable, property, parameter or an object.
-    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);
-      output += codeGenerator.GenerateVariableValueAs(type);
-    }, [&]() {
-      if (!codeGenerator.HasProjectAndLayout()) {
-        gd::LogWarning("Tried to generate access to a variable without a project/scene - the code generator only works for global and scene variables for now.");
-        output += GenerateDefaultValue(type);
-        return;
-      }
-
-      // This could be adapted in the future if more scopes are supported at runtime.
-      EventsCodeGenerator::VariableScope scope = gd::EventsCodeGenerator::PROJECT_VARIABLE;
-      if (variablesContainersList.GetBottomMostVariablesContainer()->Has(node.identifierName)) {
-        scope = gd::EventsCodeGenerator::LAYOUT_VARIABLE;
-      }
-
-      output += codeGenerator.GenerateGetVariable(node.identifierName, scope, context, "");
-      if (!node.childIdentifierName.empty()) {
-        output += codeGenerator.GenerateVariableAccessor(node.childIdentifierName);
-      }
-      output += codeGenerator.GenerateVariableValueAs(type);
-    }, [&]() {
-      const auto& propertiesContainerAndProperty = propertiesContainersList.Get(node.identifierName);
-
-      output += codeGenerator.GeneratePropertyGetter(
-        propertiesContainerAndProperty.first, propertiesContainerAndProperty.second, type, context);
-    }, [&]() {
-      const auto& parameter = gd::ParameterMetadataTools::Get(parametersVectorsList, node.identifierName);
-      output += codeGenerator.GenerateParameterGetter(parameter, type, context);
-    }, [&]() {
-      // The identifier does not represents a variable (or a child variable), or not at least an existing
-      // one, nor an object variable. It's invalid.
-      output += GenerateDefaultValue(type);
-    });
+    output += "/* Error during generation, unrecognized identifier type: " +
+              codeGenerator.ConvertToString(node.type) + " with value " +
+              codeGenerator.ConvertToString(node.identifierName) + " */ " +
+              codeGenerator.ConvertToStringExplicit(node.identifierName);
  }
 }

 void ExpressionCodeGenerator::OnVisitFunctionCallNode(FunctionCallNode& node) {
-  auto type = gd::ExpressionTypeFinder::GetType(codeGenerator.GetPlatform(),
-                                            codeGenerator.GetProjectScopedContainers(),
-                                            rootType,
-                                            node);
-
-  const gd::ExpressionMetadata &metadata = MetadataProvider::GetFunctionCallMetadata(
-      codeGenerator.GetPlatform(),
-      codeGenerator.GetObjectsContainersList(),
-      node);
-
-  if (gd::MetadataProvider::IsBadExpressionMetadata(metadata)) {
+  if (gd::MetadataProvider::IsBadExpressionMetadata(node.expressionMetadata)) {
    output += "/* Error during generation, function not found: " +
              codeGenerator.ConvertToString(node.functionName) + " */ " +
-              GenerateDefaultValue(type);
+              GenerateDefaultValue(node.type);
    return;
  }

  if (!node.objectName.empty()) {
    if (!node.behaviorName.empty()) {
-      output += GenerateBehaviorFunctionCode(type,
+      output += GenerateBehaviorFunctionCode(node.type,
                                             node.objectName,
                                             node.behaviorName,
                                             node.parameters,
-                                             metadata);
+                                             node.expressionMetadata);
    } else {
      output += GenerateObjectFunctionCode(
-          type, node.objectName, node.parameters, metadata);
+          node.type, node.objectName, node.parameters, node.expressionMetadata);
    }
  } else {
    output +=
-        GenerateFreeFunctionCode(node.parameters, metadata);
+        GenerateFreeFunctionCode(node.parameters, node.expressionMetadata);
  }
 }

@@ -308,10 +165,10 @@ gd::String ExpressionCodeGenerator::GenerateFreeFunctionCode(
    const std::vector<std::unique_ptr<ExpressionNode>>& parameters,
    const ExpressionMetadata& expressionMetadata) {
  codeGenerator.AddIncludeFiles(
-      expressionMetadata.GetIncludeFiles());
+      expressionMetadata.codeExtraInformation.GetIncludeFiles());

  // Launch custom code generator if needed
-  if (expressionMetadata.HasCustomCodeGenerator()) {
+  if (expressionMetadata.codeExtraInformation.HasCustomCodeGenerator()) {
    return expressionMetadata.codeExtraInformation.customCodeGenerator(
        PrintParameters(parameters), codeGenerator, context);
  }
@@ -328,11 +185,16 @@ gd::String ExpressionCodeGenerator::GenerateObjectFunctionCode(
    const gd::String& objectName,
    const std::vector<std::unique_ptr<ExpressionNode>>& parameters,
    const ExpressionMetadata& expressionMetadata) {
+  const gd::ObjectsContainer& globalObjectsAndGroups =
+      codeGenerator.GetGlobalObjectsAndGroups();
+  const gd::ObjectsContainer& objectsAndGroups =
+      codeGenerator.GetObjectsAndGroups();
+
  codeGenerator.AddIncludeFiles(
-      expressionMetadata.GetIncludeFiles());
+      expressionMetadata.codeExtraInformation.GetIncludeFiles());

  // Launch custom code generator if needed
-  if (expressionMetadata.HasCustomCodeGenerator()) {
+  if (expressionMetadata.codeExtraInformation.HasCustomCodeGenerator()) {
    return expressionMetadata.codeExtraInformation.customCodeGenerator(
        PrintParameters(parameters), codeGenerator, context);
  }
@@ -348,14 +210,20 @@ gd::String ExpressionCodeGenerator::GenerateObjectFunctionCode(

  // Get object(s) concerned by function call
  std::vector<gd::String> realObjects =
-      codeGenerator.GetObjectsContainersList().ExpandObjectName(objectName, context.GetCurrentObject());
+      codeGenerator.ExpandObjectsName(objectName, context);
  for (std::size_t i = 0; i < realObjects.size(); ++i) {
    context.ObjectsListNeeded(realObjects[i]);

-    gd::String objectType = codeGenerator.GetObjectsContainersList().GetTypeOfObject(realObjects[i]);
+    gd::String objectType = gd::GetTypeOfObject(
+        globalObjectsAndGroups, objectsAndGroups, realObjects[i]);
    const ObjectMetadata& objInfo = MetadataProvider::GetObjectMetadata(
        codeGenerator.GetPlatform(), objectType);

+    if (objInfo.IsUnsupportedBaseObjectCapability(
+            expressionMetadata.GetRequiredBaseObjectCapability())) {
+      // Do nothing, skipping objects not supporting the capability required by
+      // this expression.
+    } else {
      codeGenerator.AddIncludeFiles(objInfo.includeFiles);
      functionOutput = codeGenerator.GenerateObjectFunctionCall(
          realObjects[i],
@@ -364,6 +232,7 @@ gd::String ExpressionCodeGenerator::GenerateObjectFunctionCode(
          parametersCode,
          functionOutput,
          context);
+    }
  }

  return functionOutput;
@@ -374,11 +243,16 @@ gd::String ExpressionCodeGenerator::GenerateBehaviorFunctionCode(
    const gd::String& behaviorName,
    const std::vector<std::unique_ptr<ExpressionNode>>& parameters,
    const ExpressionMetadata& expressionMetadata) {
+  const gd::ObjectsContainer& globalObjectsAndGroups =
+      codeGenerator.GetGlobalObjectsAndGroups();
+  const gd::ObjectsContainer& objectsAndGroups =
+      codeGenerator.GetObjectsAndGroups();
+
  codeGenerator.AddIncludeFiles(
-      expressionMetadata.GetIncludeFiles());
+      expressionMetadata.codeExtraInformation.GetIncludeFiles());

  // Launch custom code generator if needed
-  if (expressionMetadata.HasCustomCodeGenerator()) {
+  if (expressionMetadata.codeExtraInformation.HasCustomCodeGenerator()) {
    return expressionMetadata.codeExtraInformation.customCodeGenerator(
        PrintParameters(parameters), codeGenerator, context);
  }
@@ -392,11 +266,12 @@ gd::String ExpressionCodeGenerator::GenerateBehaviorFunctionCode(

  // Get object(s) concerned by function call
  std::vector<gd::String> realObjects =
-      codeGenerator.GetObjectsContainersList().ExpandObjectName(objectName, context.GetCurrentObject());
+      codeGenerator.ExpandObjectsName(objectName, context);

  gd::String functionOutput = GenerateDefaultValue(type);

-  gd::String behaviorType = codeGenerator.GetObjectsContainersList().GetTypeOfBehavior(behaviorName);
+  gd::String behaviorType = gd::GetTypeOfBehavior(
+      globalObjectsAndGroups, objectsAndGroups, behaviorName);
  const BehaviorMetadata& autoInfo = MetadataProvider::GetBehaviorMetadata(
      codeGenerator.GetPlatform(), behaviorType);

@@ -430,20 +305,18 @@ gd::String ExpressionCodeGenerator::GenerateParametersCodes(

    auto& parameterMetadata = expressionMetadata.parameters[i];
    if (!parameterMetadata.IsCodeOnly()) {
+      ExpressionCodeGenerator generator(codeGenerator, context);
      if (nonCodeOnlyParameterIndex < parameters.size()) {
-        auto objectName = gd::ExpressionVariableOwnerFinder::GetObjectName(codeGenerator.GetPlatform(),
-                                              codeGenerator.GetObjectsContainersList(),
-                                              rootObjectName,
-                                              *parameters[nonCodeOnlyParameterIndex].get());
-        ExpressionCodeGenerator generator(parameterMetadata.GetType(), objectName, codeGenerator, context);
        parameters[nonCodeOnlyParameterIndex]->Visit(generator);
        parametersCode += generator.GetOutput();
      } else if (parameterMetadata.IsOptional()) {
-        ExpressionCodeGenerator generator(parameterMetadata.GetType(), "", codeGenerator, context);
        // Optional parameters default value were not parsed at the time of the
        // expression parsing. Parse them now.
-        ExpressionParser2 parser;
-        auto node = parser.ParseExpression(parameterMetadata.GetDefaultValue());
+        ExpressionParser2 parser(codeGenerator.GetPlatform(),
+                                 codeGenerator.GetGlobalObjectsAndGroups(),
+                                 codeGenerator.GetObjectsAndGroups());
+        auto node = parser.ParseExpression(parameterMetadata.GetType(),
+                                           parameterMetadata.GetDefaultValue());

        node->Visit(generator);
        parametersCode += generator.GetOutput();
@@ -501,20 +374,12 @@ gd::String ExpressionCodeGenerator::GenerateDefaultValue(
 }

 void ExpressionCodeGenerator::OnVisitEmptyNode(EmptyNode& node) {
-  auto type = gd::ExpressionTypeFinder::GetType(codeGenerator.GetPlatform(),
-                                            codeGenerator.GetProjectScopedContainers(),
-                                            rootType,
-                                            node);
-  output += GenerateDefaultValue(type);
+  output += GenerateDefaultValue(node.type);
 }

 void ExpressionCodeGenerator::OnVisitObjectFunctionNameNode(
    ObjectFunctionNameNode& node) {
-  auto type = gd::ExpressionTypeFinder::GetType(codeGenerator.GetPlatform(),
-                                            codeGenerator.GetProjectScopedContainers(),
-                                            rootType,
-                                            node);
-  output += GenerateDefaultValue(type);
+  output += GenerateDefaultValue(node.type);
 }

 }  // namespace gd
--- a/Core/GDCore/Events/CodeGeneration/ExpressionCodeGenerator.h
+++ b/Core/GDCore/Events/CodeGeneration/ExpressionCodeGenerator.h
@@ -9,6 +9,7 @@

 #include <memory>
 #include <vector>
+#include "GDCore/Events/Parsers/ExpressionParser2.h"
 #include "GDCore/Events/Parsers/ExpressionParser2Node.h"
 #include "GDCore/Events/Parsers/ExpressionParser2NodeWorker.h"
 #include "GDCore/String.h"
@@ -34,11 +35,9 @@ namespace gd {
 */
 class GD_CORE_API ExpressionCodeGenerator : public ExpressionParser2NodeWorker {
 public:
-  ExpressionCodeGenerator(const gd::String &rootType_,
-                          const gd::String &rootObjectName_,
-                          EventsCodeGenerator& codeGenerator_,
+  ExpressionCodeGenerator(EventsCodeGenerator& codeGenerator_,
                          EventsCodeGenerationContext& context_)
-      : rootType(rootType_), rootObjectName(rootObjectName_), codeGenerator(codeGenerator_), context(context_){};
+      : codeGenerator(codeGenerator_), context(context_){};
  virtual ~ExpressionCodeGenerator(){};

  /**
@@ -58,7 +57,7 @@ class GD_CORE_API ExpressionCodeGenerator : public ExpressionParser2NodeWorker {
  static gd::String GenerateExpressionCode(EventsCodeGenerator& codeGenerator,
                                           EventsCodeGenerationContext& context,
                                           const gd::String& type,
-                                           const gd::Expression& expression,
+                                           const gd::String& expression,
                                           const gd::String& objectName = "");

  const gd::String& GetOutput() { return output; };
@@ -102,11 +101,8 @@ class GD_CORE_API ExpressionCodeGenerator : public ExpressionParser2NodeWorker {
      const std::vector<std::unique_ptr<ExpressionNode>>& parameters);

  gd::String output;
-  gd::String objectNameToUseForVariableAccessor;
  EventsCodeGenerator& codeGenerator;
  EventsCodeGenerationContext& context;
-  const gd::String rootType;
-  const gd::String rootObjectName;
 };

 }  // namespace gd
--- a/Core/GDCore/Events/Event.cpp
+++ b/Core/GDCore/Events/Event.cpp
@@ -5,12 +5,8 @@
 */

 #include "GDCore/Events/Event.h"
-
-#include "GDCore/Events/Builtin/AsyncEvent.h"
 #include "GDCore/Events/CodeGeneration/EventsCodeGenerator.h"
 #include "GDCore/Events/EventsList.h"
-#include "GDCore/Events/EventVisitor.h"
-#include "GDCore/Extensions/Metadata/MetadataProvider.h"
 #include "GDCore/Extensions/Platform.h"
 #include "GDCore/Extensions/PlatformExtension.h"

@@ -69,41 +65,10 @@ gd::String BaseEvent::GenerateEventCode(
  return "";
 }

-void BaseEvent::PreprocessAsyncActions(const gd::Platform& platform) {
-  if (!CanHaveSubEvents()) return;
-  for (const auto& actionsList : GetAllActionsVectors())
-    for (std::size_t aId = 0; aId < actionsList->size(); ++aId) {
-      const auto& action = actionsList->at(aId);
-      const gd::InstructionMetadata& actionMetadata =
-          gd::MetadataProvider::GetActionMetadata(platform, action.GetType());
-      if (actionMetadata.IsAsync() &&
-          (!actionMetadata.IsOptionallyAsync() || action.IsAwaited())) {
-        gd::InstructionsList remainingActions;
-        remainingActions.InsertInstructions(
-            *actionsList, aId + 1, actionsList->size() - 1);
-        gd::AsyncEvent asyncEvent(action, remainingActions, GetSubEvents());
-
-        // Ensure that the local event no longer has any of the actions/subevent
-        // after the async function
-        actionsList->RemoveAfter(aId);
-        GetSubEvents().Clear();
-
-        GetSubEvents().InsertEvent(asyncEvent);
-
-        // We just moved all the rest, there's nothing left to do in this event.
-        return;
-      }
-    }
-};
-
 void BaseEvent::Preprocess(gd::EventsCodeGenerator& codeGenerator,
                           gd::EventsList& eventList,
                           std::size_t indexOfTheEventInThisList) {
-  if (IsDisabled()) return;
-
-  PreprocessAsyncActions(codeGenerator.GetPlatform());
-
-  if (!MustBePreprocessed()) return;
+  if (IsDisabled() || !MustBePreprocessed()) return;

  try {
    if (type.empty()) return;
@@ -141,14 +106,6 @@ void BaseEvent::Preprocess(gd::EventsCodeGenerator& codeGenerator,
  }
 }

-bool BaseEvent::AcceptVisitor(gd::EventVisitor& eventVisitor) {
-  return eventVisitor.VisitEvent(*this);
-}
-
-void BaseEvent::AcceptVisitor(gd::ReadOnlyEventVisitor& eventVisitor) const {
-  eventVisitor.VisitEvent(*this);
-}
-
 BaseEventSPtr GD_CORE_API CloneRememberingOriginalEvent(BaseEventSPtr event) {
  gd::BaseEventSPtr copy(event->Clone());
  // Original event is either the original event of the copied event, or the
--- a/Core/GDCore/Events/Event.h
+++ b/Core/GDCore/Events/Event.h
@@ -10,7 +10,6 @@
 #include <iostream>
 #include <memory>
 #include <vector>
-
 #include "GDCore/Events/Instruction.h"
 #include "GDCore/Events/InstructionsList.h"
 #include "GDCore/Extensions/Metadata/InstructionMetadata.h"
@@ -24,9 +23,7 @@ class EventsCodeGenerationContext;
 class Platform;
 class SerializerElement;
 class Instruction;
-class EventVisitor;
-class ReadOnlyEventVisitor;
-}  // namespace gd
+}

 namespace gd {

@@ -139,15 +136,13 @@ class GD_CORE_API BaseEvent {
   * \note Used to preprocess or search in the expressions of the event.
   */
  virtual std::vector<std::pair<gd::Expression*, gd::ParameterMetadata> >
-  GetAllExpressionsWithMetadata() {
+      GetAllExpressionsWithMetadata() {
    std::vector<std::pair<gd::Expression*, gd::ParameterMetadata> > noExpr;
    return noExpr;
  };
-  virtual std::vector<
-      std::pair<const gd::Expression*, const gd::ParameterMetadata> >
-  GetAllExpressionsWithMetadata() const {
-    std::vector<std::pair<const gd::Expression*, const gd::ParameterMetadata> >
-        noExpr;
+  virtual std::vector<std::pair<const gd::Expression*, const gd::ParameterMetadata> >
+      GetAllExpressionsWithMetadata() const {
+    std::vector<std::pair<const gd::Expression*, const gd::ParameterMetadata> > noExpr;
    return noExpr;
  };

@@ -211,11 +206,6 @@ class GD_CORE_API BaseEvent {
                          gd::EventsList& eventList,
                          std::size_t indexOfTheEventInThisList);

-  /**
-   * A function that turns all async member actions into an Async subevent for code generation.
-   */
-  void PreprocessAsyncActions(const gd::Platform& platform);
-
  /**
   * \brief If MustBePreprocessed is redefined to return true, the
   * gd::EventMetadata::preprocessing associated to the event will be called to
@@ -240,9 +230,6 @@ class GD_CORE_API BaseEvent {
   */
  virtual void UnserializeFrom(gd::Project& project,
                               const SerializerElement& element){};
-
-  virtual bool AcceptVisitor(gd::EventVisitor& eventVisitor);
-  virtual void AcceptVisitor(gd::ReadOnlyEventVisitor& eventVisitor) const;
  ///@}

  /** \name Common properties
@@ -281,6 +268,7 @@ class GD_CORE_API BaseEvent {
   * \brief True if the event should be folded in the events editor.
   */
  bool IsFolded() const { return folded; }
+
  ///@}

  std::weak_ptr<gd::BaseEvent>
--- a/Core/GDCore/Events/EventVisitor.h
+++ b/Core/GDCore/Events/EventVisitor.h
@@ -1,76 +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 <iostream>
-#include <memory>
-#include <vector>
-
-#include "GDCore/String.h"
-
-namespace gd {
-class BaseEvent;
-class LinkEvent;
-}  // namespace gd
-
-namespace gd {
-
-/**
- * \brief Visitor of any kind of event.
- *
- * \ingroup Events
- */
-class GD_CORE_API EventVisitor {
- public:
-  virtual ~EventVisitor(){};
-
-  /**
-   * Called to do some work on an event.
-   * 
-   * \return true if the event must be deleted from the events list, false
-   * otherwise.
-   */
-  virtual bool VisitEvent(gd::BaseEvent& linkEvent) = 0;
-  
-  /**
-   * Called to do some work on a link event.
-   * 
-   * Note that VisitEvent is also called with this event.
-   * 
-   * \return true if the event must be deleted from the events list, false
-   * otherwise.
-   */
-  virtual bool VisitLinkEvent(gd::LinkEvent& linkEvent) = 0;
-};
-
-/**
- * \brief Visitor of any kind of event.
- *
- * \ingroup Events
- */
-class GD_CORE_API ReadOnlyEventVisitor {
- public:
-  virtual ~ReadOnlyEventVisitor(){};
-
-  /**
-   * Called to do some work on an event.
-   */
-  virtual void VisitEvent(const gd::BaseEvent& linkEvent) = 0;
-
-  /**
-   * Called to do some work on a link event.
-   * 
-   * Note that VisitEvent is also called with this event.
-   */
-  virtual void VisitLinkEvent(const gd::LinkEvent& linkEvent) = 0;
-
-  /**
-   * @brief Abort the iteration on the events.
-   */
-  virtual void StopAnyEventIteration() = 0;
-};
-
-}
--- a/Core/GDCore/Events/EventsList.cpp
+++ b/Core/GDCore/Events/EventsList.cpp
@@ -5,7 +5,6 @@
 */

 #include "EventsList.h"
-
 #include "GDCore/Events/Event.h"
 #include "GDCore/Project/Project.h"
 #include "GDCore/Tools/Log.h"
@@ -101,8 +100,9 @@ bool EventsList::Contains(const gd::BaseEvent& eventToSearch,
 }

 bool EventsList::MoveEventToAnotherEventsList(const gd::BaseEvent& eventToMove,
-                                              gd::EventsList& newEventsList,
-                                              std::size_t newPosition) {
+                                  gd::EventsList& newEventsList,
+                                  std::size_t newPosition) {
+
  for (std::size_t i = 0; i < GetEventsCount(); ++i) {
    if (events[i].get() == &eventToMove) {
      std::shared_ptr<BaseEvent> event = events[i];
--- a/Core/GDCore/Events/Expression.cpp
+++ b/Core/GDCore/Events/Expression.cpp
@@ -1,41 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-
-#include "GDCore/Events/Expression.h"
-
-#include "GDCore/Events/Parsers/ExpressionParser2.h"
-#include "GDCore/String.h"
-
-namespace gd {
-
-Expression::Expression() : node(nullptr) {};
-
-Expression::Expression(gd::String plainString_)
-    : node(nullptr), plainString(plainString_) {};
-
-Expression::Expression(const char* plainString_)
-    : node(nullptr), plainString(plainString_) {};
-
-Expression::Expression(const Expression& copy)
-    : node(nullptr), plainString{copy.plainString} {};
-
-Expression& Expression::operator=(const Expression& expression) {
-  plainString = expression.plainString;
-  node = nullptr;
-  return *this;
-};
-
-Expression::~Expression(){};
-
-ExpressionNode* Expression::GetRootNode() const {
-  if (!node) {
-    gd::ExpressionParser2 parser = ExpressionParser2();
-    node = std::move(parser.ParseExpression(plainString));
-  }
-  return node.get();
-}
-
-}  // namespace gd
--- a/Core/GDCore/Events/Expression.h
+++ b/Core/GDCore/Events/Expression.h
@@ -6,15 +6,7 @@

 #ifndef GDCORE_EXPRESSION_H
 #define GDCORE_EXPRESSION_H
-
 #include "GDCore/String.h"
-#include <memory>
-
-namespace gd {
-class ExpressionParser2;
-class ObjectsContainer;
-struct ExpressionNode;
-}  // namespace gd

 namespace gd {

@@ -32,49 +24,32 @@ class GD_CORE_API Expression {
  /**
   * \brief Construct an empty expression
   */
-  Expression();
+  Expression(){};

  /**
   * \brief Construct an expression from a string
   */
-  Expression(gd::String plainString_);
+  Expression(gd::String plainString_) : plainString(plainString_){};

  /**
   * \brief Construct an expression from a const char *
   */
-  Expression(const char* plainString_);
-
-  /**
-   * \brief Copy construct an expression.
-   */
-  Expression(const Expression& copy);
-
-  /**
-   * \brief Expression affectation overriding.
-   */
-  Expression& operator=(const Expression& expression);
+  Expression(const char* plainString_) : plainString(plainString_){};

  /**
   * \brief Get the plain string representing the expression
   */
  inline const gd::String& GetPlainString() const { return plainString; };

-  /**
-   * @brief Get the expression node.
-   * @return std::unique_ptr<gd::ExpressionNode>
-   */
-  gd::ExpressionNode* GetRootNode() const;
-
  /**
   * \brief Mimics std::string::c_str
   */
  inline const char* c_str() const { return plainString.c_str(); };

-  virtual ~Expression();
+  virtual ~Expression(){};

 private:
  gd::String plainString;  ///< The expression string
-  mutable std::unique_ptr<gd::ExpressionNode> node;
 };

 }  // namespace gd
--- a/Core/GDCore/Events/Instruction.cpp
+++ b/Core/GDCore/Events/Instruction.cpp
@@ -55,10 +55,6 @@ void Instruction::SetParameter(std::size_t nb, const gd::Expression& val) {
  parameters[nb] = val;
 }

-void Instruction::AddParameter(const gd::Expression& val) {
-  parameters.push_back(val);
-}
-
 std::shared_ptr<Instruction> GD_CORE_API
 CloneRememberingOriginalElement(std::shared_ptr<Instruction> instruction) {
  std::shared_ptr<Instruction> copy =
--- a/Core/GDCore/Events/Instruction.h
+++ b/Core/GDCore/Events/Instruction.h
@@ -72,22 +72,6 @@ class GD_CORE_API Instruction {
   */
  void SetInverted(bool inverted_) { inverted = inverted_; }

-  /**
-   * \brief Return true if the async instruction should be awaited.
-   * This is not relevant if the instruction is not optionally asynchronous.
-   *
-   * \return true if the instruction is to be awaited
-   */
-  bool IsAwaited() const { return awaitAsync; }
-
-  /**
-   * \brief Set if the async instruction is to be awaited or not.
-   * This is not relevant if the instruction is not optionally asynchronous.
-   *
-   * \param inverted true if the instruction must be awaited
-   */
-  void SetAwaited(bool awaited) { awaitAsync = awaited; }
-
  /**
   * \brief Return the number of parameters of the instruction.
   */
@@ -123,11 +107,6 @@ class GD_CORE_API Instruction {
   */
  void SetParameter(std::size_t nb, const gd::Expression& val);

-  /** Add a parameter at the end
-   * \param val The new value of the parameter
-   */
-  void AddParameter(const gd::Expression& val);
-
  /** \brief Get a reference to the std::vector containing the parameters.
   * \return A std::vector containing the parameters
   */
@@ -160,9 +139,7 @@ class GD_CORE_API Instruction {
   * Useful to get reference to the original instruction in memory during code
   * generation, to ensure stable unique identifiers.
   */
-  std::weak_ptr<Instruction> GetOriginalInstruction() {
-    return originalInstruction;
-  };
+  std::weak_ptr<Instruction> GetOriginalInstruction() { return originalInstruction; };

  friend std::shared_ptr<Instruction> CloneRememberingOriginalElement(
      std::shared_ptr<Instruction> instruction);
@@ -171,9 +148,6 @@ class GD_CORE_API Instruction {
  gd::String type;  ///< Instruction type
  bool inverted;  ///< True if the instruction if inverted. Only applicable for
                  ///< instruction used as conditions by events
-  bool awaitAsync =
-      false;  ///< Tells the code generator whether the optionally asynchronous
-              ///< instruction should be generated as asynchronous (awaited) or not.
  mutable std::vector<gd::Expression>
      parameters;                        ///< Vector containing the parameters
  gd::InstructionsList subInstructions;  ///< Sub instructions, if applicable.
--- a/Core/GDCore/Events/InstructionsList.cpp
+++ b/Core/GDCore/Events/InstructionsList.cpp
@@ -5,7 +5,6 @@
 */

 #include "InstructionsList.h"
-
 #include "GDCore/Events/Instruction.h"
 #include "GDCore/Project/Project.h"
 #include "Serialization.h"
@@ -32,10 +31,6 @@ void InstructionsList::InsertInstructions(const InstructionsList& list,
  }
 }

-void InstructionsList::RemoveAfter(const size_t position) {
-  elements.resize(position);
-}
-
 void InstructionsList::SerializeTo(SerializerElement& element) const {
  EventsListSerialization::SerializeInstructionsTo(*this, element);
 }
--- a/Core/GDCore/Events/InstructionsList.h
+++ b/Core/GDCore/Events/InstructionsList.h
@@ -6,10 +6,9 @@

 #ifndef GDCORE_INSTRUCTIONSLIST_H
 #define GDCORE_INSTRUCTIONSLIST_H
-#include "GDCore/Tools/SPtrList.h"
 #include <memory>
 #include <vector>
-
+#include "GDCore/Tools/SPtrList.h"
 namespace gd {
 class Instruction;
 }
@@ -23,11 +22,11 @@ class SerializerElement;
 namespace gd {

 class InstructionsList : public SPtrList<gd::Instruction> {
-public:
-  void InsertInstructions(const InstructionsList &list, size_t begin,
-                          size_t end, size_t position = (size_t)-1);
-
-  void RemoveAfter(size_t position);
+ public:
+  void InsertInstructions(const InstructionsList& list,
+                          size_t begin,
+                          size_t end,
+                          size_t position = (size_t)-1);

  /** \name Serialization
   */
@@ -36,17 +35,17 @@ public:
   * \brief Serialize the instructions to the specified element
   * \see EventsListSerialization
   */
-  void SerializeTo(gd::SerializerElement &element) const;
+  void SerializeTo(gd::SerializerElement& element) const;

  /**
   * \brief Load the instructions from the specified element
   * \see EventsListSerialization
   */
-  void UnserializeFrom(gd::Project &project,
-                       const gd::SerializerElement &element);
+  void UnserializeFrom(gd::Project& project,
+                       const gd::SerializerElement& element);
  ///@}
 };

-} // namespace gd
+}  // namespace gd

 #endif
--- a/Core/GDCore/Events/Parsers/ExpressionParser2.cpp
+++ b/Core/GDCore/Events/Parsers/ExpressionParser2.cpp
@@ -19,25 +19,139 @@
 #include "GDCore/Project/Project.h"
 #include "GDCore/Tools/Localization.h"
 #include "GDCore/Tools/MakeUnique.h"
-#include "GrammarTerminals.h"

 using namespace std;
-using namespace gd::GrammarTerminals;

 namespace gd {

 gd::String ExpressionParser2::NAMESPACE_SEPARATOR = "::";

-ExpressionParser2::ExpressionParser2()
+ExpressionParser2::ExpressionParser2(
+    const gd::Platform& platform_,
+    const gd::ObjectsContainer& globalObjectsContainer_,
+    const gd::ObjectsContainer& objectsContainer_)
    : expression(""),
-      currentPosition(0) {}
+      currentPosition(0),
+      platform(platform_),
+      globalObjectsContainer(globalObjectsContainer_),
+      objectsContainer(objectsContainer_) {}
+
+namespace {
+/**
+ * Return the minimum number of parameters, starting from a given parameter
+ * (by convention, 1 for object functions and 2 for behavior functions).
+ */
+size_t GetMinimumParametersNumber(
+    const std::vector<gd::ParameterMetadata>& parameters,
+    size_t initialParameterIndex) {
+  size_t nb = 0;
+  for (std::size_t i = initialParameterIndex; i < parameters.size(); ++i) {
+    if (!parameters[i].optional && !parameters[i].codeOnly) nb++;
+  }
+
+  return nb;
+}
+
+/**
+ * Return the maximum number of parameters, starting from a given parameter
+ * (by convention, 1 for object functions and 2 for behavior functions).
+ */
+size_t GetMaximumParametersNumber(
+    const std::vector<gd::ParameterMetadata>& parameters,
+    size_t initialParameterIndex) {
+  size_t nb = 0;
+  for (std::size_t i = initialParameterIndex; i < parameters.size(); ++i) {
+    if (!parameters[i].codeOnly) nb++;
+  }
+
+  return nb;
+}
+}  // namespace
+
+std::unique_ptr<ExpressionParserDiagnostic> ExpressionParser2::ValidateFunction(
+    const gd::String& type,
+    const gd::FunctionCallNode& function,
+    size_t functionStartPosition) {
+  if (gd::MetadataProvider::IsBadExpressionMetadata(
+          function.expressionMetadata)) {
+    return gd::make_unique<ExpressionParserError>(
+        "invalid_function_name",
+        _("Cannot find an expression with this name: ") +
+            function.functionName + "\n" +
+            _("Double check that you've not made any typo in the name."),
+        functionStartPosition,
+        GetCurrentPosition());
+  }
+
+  // Validate the type of the function
+  const gd::String& returnType = function.expressionMetadata.GetReturnType();
+  if (returnType == "number") {
+    if (type == "string")
+      return RaiseTypeError(
+          _("You tried to use an expression that returns a number, but a "
+            "string is expected. Use `ToString` if you need to convert a "
+            "number to a string."),
+          functionStartPosition);
+    else if (type != "number" && type != "number|string")
+      return RaiseTypeError(_("You tried to use an expression that returns a "
+                              "number, but another type is expected:") +
+                              " " + type,
+                            functionStartPosition);
+  } else if (returnType == "string") {
+    if (type == "number")
+      return RaiseTypeError(
+          _("You tried to use an expression that returns a string, but a "
+            "number is expected. Use `ToNumber` if you need to convert a "
+            "string to a number."),
+          functionStartPosition);
+    else if (type != "string" && type != "number|string")
+      return RaiseTypeError(_("You tried to use an expression that returns a "
+                              "string, but another type is expected:") +
+                              " " + type,
+                            functionStartPosition);
+  } else {
+    if (type != returnType)
+      return RaiseTypeError(
+          _("You tried to use an expression with the wrong return type:") + " " +
+            returnType,
+          functionStartPosition);
+  }
+
+  // Validate parameters count
+  size_t minParametersCount = GetMinimumParametersNumber(
+      function.expressionMetadata.parameters,
+      WrittenParametersFirstIndex(function.objectName, function.behaviorName));
+  size_t maxParametersCount = GetMaximumParametersNumber(
+      function.expressionMetadata.parameters,
+      WrittenParametersFirstIndex(function.objectName, function.behaviorName));
+  if (function.parameters.size() < minParametersCount ||
+      function.parameters.size() > maxParametersCount) {
+    gd::String expectedCountMessage =
+        minParametersCount == maxParametersCount
+            ? _("The number of parameters must be exactly ") +
+                  gd::String::From(minParametersCount)
+            : _("The number of parameters must be: ") +
+                  gd::String::From(minParametersCount) + "-" +
+                  gd::String::From(maxParametersCount);
+
+    if (function.parameters.size() < minParametersCount) {
+      return gd::make_unique<ExpressionParserError>(
+          "too_few_parameters",
+          "You have not entered enough parameters for the expression. " +
+              expectedCountMessage,
+          functionStartPosition,
+          GetCurrentPosition());
+    }
+  }
+
+  return gd::make_unique<ExpressionParserDiagnostic>();
+}

 std::unique_ptr<TextNode> ExpressionParser2::ReadText() {
  size_t textStartPosition = GetCurrentPosition();
  SkipAllWhitespaces();
  if (!CheckIfChar(IsQuote)) {
    auto text = gd::make_unique<TextNode>("");
-	  // It can't happen.
    text->diagnostic =
        RaiseSyntaxError(_("A text must start with a double quote (\")."));
    text->location =
--- a/Core/GDCore/Events/Parsers/ExpressionParser2.h
+++ b/Core/GDCore/Events/Parsers/ExpressionParser2.h
--- a/Core/GDCore/Events/Parsers/ExpressionParser2Node.h
+++ b/Core/GDCore/Events/Parsers/ExpressionParser2Node.h
@@ -17,7 +17,6 @@ class ObjectsContainer;
 class Platform;
 class ParameterMetadata;
 class ExpressionMetadata;
-struct FunctionCallNode;
 }  // namespace gd

 namespace gd {
@@ -58,10 +57,6 @@ struct GD_CORE_API ExpressionParserDiagnostic {
 * \brief An error that can be attached to a gd::ExpressionNode.
 */
 struct GD_CORE_API ExpressionParserError : public ExpressionParserDiagnostic {
-  ExpressionParserError(const gd::String &type_,
-                        const gd::String &message_,
-                        const ExpressionParserLocation &location_)
-      : type(type_), message(message_), location(location_){};
  ExpressionParserError(const gd::String &type_,
                        const gd::String &message_,
                        size_t position_)
@@ -91,7 +86,7 @@ struct GD_CORE_API ExpressionParserError : public ExpressionParserDiagnostic {
 * an expression inherits from.
 */
 struct GD_CORE_API ExpressionNode {
-  ExpressionNode() : parent(nullptr) {};
+  ExpressionNode(const gd::String &type_) : type(type_){};
  virtual ~ExpressionNode(){};
  virtual void Visit(ExpressionParser2NodeWorker &worker){};

@@ -102,12 +97,17 @@ struct GD_CORE_API ExpressionNode {
                                      /// function can store the position of the
                                      /// object name, the dot, the function
                                      /// name, etc...
-  ExpressionNode *parent;
+
+  gd::String type;  // Actual type of the node.
+                    // "string", "number", type supported by
+                    // gd::ParameterMetadata::IsObject, types supported by
+                    // gd::ParameterMetadata::IsExpression or "unknown".
 };

 struct GD_CORE_API SubExpressionNode : public ExpressionNode {
-  SubExpressionNode(std::unique_ptr<ExpressionNode> expression_)
-      : ExpressionNode(), expression(std::move(expression_)){};
+  SubExpressionNode(const gd::String &type_,
+                    std::unique_ptr<ExpressionNode> expression_)
+      : ExpressionNode(type_), expression(std::move(expression_)){};
  virtual ~SubExpressionNode(){};
  virtual void Visit(ExpressionParser2NodeWorker &worker) {
    worker.OnVisitSubExpressionNode(*this);
@@ -120,8 +120,8 @@ struct GD_CORE_API SubExpressionNode : public ExpressionNode {
 * \brief An operator node. For example: "lhs + rhs".
 */
 struct GD_CORE_API OperatorNode : public ExpressionNode {
-  OperatorNode(gd::String::value_type op_)
-      : ExpressionNode(), op(op_){};
+  OperatorNode(const gd::String &type_, gd::String::value_type op_)
+      : ExpressionNode(type_), op(op_){};
  virtual ~OperatorNode(){};
  virtual void Visit(ExpressionParser2NodeWorker &worker) {
    worker.OnVisitOperatorNode(*this);
@@ -136,8 +136,8 @@ struct GD_CORE_API OperatorNode : public ExpressionNode {
 * \brief A unary operator node. For example: "-2".
 */
 struct GD_CORE_API UnaryOperatorNode : public ExpressionNode {
-  UnaryOperatorNode(gd::String::value_type op_)
-      : ExpressionNode(), op(op_){};
+  UnaryOperatorNode(const gd::String &type_, gd::String::value_type op_)
+      : ExpressionNode(type_), op(op_){};
  virtual ~UnaryOperatorNode(){};
  virtual void Visit(ExpressionParser2NodeWorker &worker) {
    worker.OnVisitUnaryOperatorNode(*this);
@@ -153,7 +153,7 @@ struct GD_CORE_API UnaryOperatorNode : public ExpressionNode {
 */
 struct GD_CORE_API NumberNode : public ExpressionNode {
  NumberNode(const gd::String &number_)
-      : ExpressionNode(), number(number_){};
+      : ExpressionNode("number"), number(number_){};
  virtual ~NumberNode(){};
  virtual void Visit(ExpressionParser2NodeWorker &worker) {
    worker.OnVisitNumberNode(*this);
@@ -168,7 +168,7 @@ struct GD_CORE_API NumberNode : public ExpressionNode {
 * Its `type` is always "string".
 */
 struct GD_CORE_API TextNode : public ExpressionNode {
-  TextNode(const gd::String &text_) : ExpressionNode(), text(text_){};
+  TextNode(const gd::String &text_) : ExpressionNode("string"), text(text_){};
  virtual ~TextNode(){};
  virtual void Visit(ExpressionParser2NodeWorker &worker) {
    worker.OnVisitTextNode(*this);
@@ -177,89 +177,32 @@ struct GD_CORE_API TextNode : public ExpressionNode {
  gd::String text;
 };

-struct GD_CORE_API IdentifierOrFunctionCallOrObjectFunctionNameOrEmptyNode
-    : public ExpressionNode {
-  IdentifierOrFunctionCallOrObjectFunctionNameOrEmptyNode()
-      : ExpressionNode(){};
-};
-
-/**
- * \brief An identifier node, usually representing an object or a variable
- * with an optional function name or child variable name respectively.
- *
- * The name of a function to call on an object or the behavior,
- * for example: "MyObject.Function" or "MyObject.Physics".
- *
- * A variable, potentially with accessor to its child,
- * for example: MyVariable or MyVariable.MyChild
- */
-struct GD_CORE_API IdentifierNode
-    : public IdentifierOrFunctionCallOrObjectFunctionNameOrEmptyNode {
-  IdentifierNode(
-  const gd::String &identifierName_)
-      : IdentifierOrFunctionCallOrObjectFunctionNameOrEmptyNode(),
-        identifierName(identifierName_),
-        childIdentifierName(""){};
-  IdentifierNode(
-  const gd::String &identifierName_,
-  const gd::String &childIdentifierName_)
-      : IdentifierOrFunctionCallOrObjectFunctionNameOrEmptyNode(),
-        identifierName(identifierName_),
-        childIdentifierName(childIdentifierName_){};
-  virtual ~IdentifierNode(){};
-  virtual void Visit(ExpressionParser2NodeWorker &worker) {
-    worker.OnVisitIdentifierNode(*this);
-  };
-
-  gd::String identifierName;  ///< The object or variable name.
-  gd::String childIdentifierName;  ///< The object function or variable child name.
-
-
-  ExpressionParserLocation
-      identifierNameLocation;  ///< Location of the object or variable name.
-  ExpressionParserLocation
-      identifierNameDotLocation;  ///< Location of the "." after the object or variable name.
-  ExpressionParserLocation childIdentifierNameLocation;  ///< Location of object
-                                                         /// function, behavior or
-                                                         /// child variable name.
-};
-
-struct GD_CORE_API FunctionCallOrObjectFunctionNameOrEmptyNode
-    : public IdentifierOrFunctionCallOrObjectFunctionNameOrEmptyNode {
-  FunctionCallOrObjectFunctionNameOrEmptyNode()
-      : IdentifierOrFunctionCallOrObjectFunctionNameOrEmptyNode(){};
-  virtual ~FunctionCallOrObjectFunctionNameOrEmptyNode(){};
-  void Visit(ExpressionParser2NodeWorker &worker) override{};
-};
-
 struct GD_CORE_API VariableAccessorOrVariableBracketAccessorNode : public ExpressionNode {
-  VariableAccessorOrVariableBracketAccessorNode() : ExpressionNode(){};
+  VariableAccessorOrVariableBracketAccessorNode() : ExpressionNode(""){};

  std::unique_ptr<VariableAccessorOrVariableBracketAccessorNode> child;
 };

 /**
- * \brief A variable, or object variable, with bracket accessor or at least 2 "dot" accessors.
+ * \brief A variable, potentially with accessor to its children.
 *
- * Example: `MyVariable["MyChildren"]` or `MyVariable.MyChildren.MyGrandChildren`.
- * Example: `MyObject["MyVariable"]` or `MyObject.MyVariable.MyChildren`.
+ * Example: MyVariable or MyVariable.MyChildren
 *
- * Other cases like "MyVariable" or "MyVariable.MyChildren" are IdentifierNode
- * to allow handling ambiguities.
- *
- * \see gd::IdentifierNode
 * \see gd::VariableAccessorNode
 * \see gd::VariableBracketAccessorNode
 */
-struct GD_CORE_API VariableNode : public FunctionCallOrObjectFunctionNameOrEmptyNode {
-  VariableNode(const gd::String &name_)
-      : FunctionCallOrObjectFunctionNameOrEmptyNode(), name(name_){};
+struct GD_CORE_API VariableNode : public ExpressionNode {
+  VariableNode(const gd::String &type_,
+               const gd::String &name_,
+               const gd::String &objectName_)
+      : ExpressionNode(type_), name(name_), objectName(objectName_){};
  virtual ~VariableNode(){};
  virtual void Visit(ExpressionParser2NodeWorker &worker) {
    worker.OnVisitVariableNode(*this);
  };

  gd::String name;
+  gd::String objectName;

  std::unique_ptr<VariableAccessorOrVariableBracketAccessorNode>
      child;  // Can be nullptr if no accessor
@@ -268,13 +211,12 @@ struct GD_CORE_API VariableNode : public FunctionCallOrObjectFunctionNameOrEmpty
 };

 /**
- * \brief A direct accessor to a child variable. Example: MyChild
+ * \brief A bracket accessor of a variable. Example: MyChild
 * in MyVariable.MyChild
 */
 struct GD_CORE_API VariableAccessorNode
    : public VariableAccessorOrVariableBracketAccessorNode {
-  VariableAccessorNode(const gd::String &name_)
-      : VariableAccessorOrVariableBracketAccessorNode(), name(name_){};
+  VariableAccessorNode(const gd::String &name_) : name(name_){};
  virtual ~VariableAccessorNode(){};
  virtual void Visit(ExpressionParser2NodeWorker &worker) {
    worker.OnVisitVariableAccessorNode(*this);
@@ -286,13 +228,13 @@ struct GD_CORE_API VariableAccessorNode
 };

 /**
- * \brief A bracket accessor to a child variable. Example: ["MyChild"]
+ * \brief A bracket accessor of a variable. Example: ["MyChild"]
 * (in MyVariable["MyChild"]).
 */
 struct GD_CORE_API VariableBracketAccessorNode
    : public VariableAccessorOrVariableBracketAccessorNode {
  VariableBracketAccessorNode(std::unique_ptr<ExpressionNode> expression_)
-      : VariableAccessorOrVariableBracketAccessorNode(), expression(std::move(expression_)){};
+      : expression(std::move(expression_)){};
  virtual ~VariableBracketAccessorNode(){};
  virtual void Visit(ExpressionParser2NodeWorker &worker) {
    worker.OnVisitVariableBracketAccessorNode(*this);
@@ -301,26 +243,55 @@ struct GD_CORE_API VariableBracketAccessorNode
  std::unique_ptr<ExpressionNode> expression;
 };

+struct GD_CORE_API IdentifierOrFunctionCallOrObjectFunctionNameOrEmptyNode
+    : public ExpressionNode {
+  IdentifierOrFunctionCallOrObjectFunctionNameOrEmptyNode(
+      const gd::String &type)
+      : ExpressionNode(type){};
+};
+
+/**
+ * \brief An identifier node, usually representing an object or a function name.
+ */
+struct GD_CORE_API IdentifierNode
+    : public IdentifierOrFunctionCallOrObjectFunctionNameOrEmptyNode {
+  IdentifierNode(const gd::String &identifierName_, const gd::String &type_)
+      : IdentifierOrFunctionCallOrObjectFunctionNameOrEmptyNode(type_),
+        identifierName(identifierName_){};
+  virtual ~IdentifierNode(){};
+  virtual void Visit(ExpressionParser2NodeWorker &worker) {
+    worker.OnVisitIdentifierNode(*this);
+  };
+
+  gd::String identifierName;
+};
+
+struct GD_CORE_API FunctionCallOrObjectFunctionNameOrEmptyNode
+    : public IdentifierOrFunctionCallOrObjectFunctionNameOrEmptyNode {
+  FunctionCallOrObjectFunctionNameOrEmptyNode(const gd::String &type)
+      : IdentifierOrFunctionCallOrObjectFunctionNameOrEmptyNode(type){};
+  virtual ~FunctionCallOrObjectFunctionNameOrEmptyNode(){};
+  void Visit(ExpressionParser2NodeWorker &worker) override{};
+};
+
 /**
 * \brief The name of a function to call on an object or the behavior
- * For example: "MyObject.Physics::LinearVelocity".
- *
- * Other cases like "MyObject.Function" or "MyObject.Physics" are IdentifierNode
- * to allow handling ambiguities.
- *
- * \see gd::IdentifierNode
+ * For example: "MyObject.Function" or "MyObject.Physics" or
+ * "MyObject.Physics::LinearVelocity".
 */
 struct GD_CORE_API ObjectFunctionNameNode
    : public FunctionCallOrObjectFunctionNameOrEmptyNode {
-  ObjectFunctionNameNode(const gd::String &objectName_,
+  ObjectFunctionNameNode(const gd::String &type_,
+                         const gd::String &objectName_,
                         const gd::String &objectFunctionOrBehaviorName_)
-      : FunctionCallOrObjectFunctionNameOrEmptyNode(),
+      : FunctionCallOrObjectFunctionNameOrEmptyNode(type_),
        objectName(objectName_),
        objectFunctionOrBehaviorName(objectFunctionOrBehaviorName_) {}
-  ObjectFunctionNameNode(const gd::String &objectName_,
+  ObjectFunctionNameNode(const gd::String &type_,
+                         const gd::String &objectName_,
                         const gd::String &behaviorName_,
                         const gd::String &behaviorFunctionName_)
-      : FunctionCallOrObjectFunctionNameOrEmptyNode(),
+      : FunctionCallOrObjectFunctionNameOrEmptyNode(type_),
        objectName(objectName_),
        objectFunctionOrBehaviorName(behaviorName_),
        behaviorFunctionName(behaviorFunctionName_) {}
@@ -363,24 +334,39 @@ struct GD_CORE_API ObjectFunctionNameNode
 */
 struct GD_CORE_API FunctionCallNode : public FunctionCallOrObjectFunctionNameOrEmptyNode {
  /** \brief Construct a free function call node. */
-  FunctionCallNode(const gd::String &functionName_)
-      : FunctionCallOrObjectFunctionNameOrEmptyNode(),
+  FunctionCallNode(const gd::String &type_,
+                   std::vector<std::unique_ptr<ExpressionNode>> parameters_,
+                   const ExpressionMetadata &expressionMetadata_,
+                   const gd::String &functionName_)
+      : FunctionCallOrObjectFunctionNameOrEmptyNode(type_),
+        parameters(std::move(parameters_)),
+        expressionMetadata(expressionMetadata_),
        functionName(functionName_){};

  /** \brief Construct an object function call node. */
-  FunctionCallNode(const gd::String &objectName_,
+  FunctionCallNode(const gd::String &type_,
+                   const gd::String &objectName_,
+                   std::vector<std::unique_ptr<ExpressionNode>> parameters_,
+                   const ExpressionMetadata &expressionMetadata_,
                   const gd::String &functionName_)
-      : FunctionCallOrObjectFunctionNameOrEmptyNode(),
+      : FunctionCallOrObjectFunctionNameOrEmptyNode(type_),
        objectName(objectName_),
+        parameters(std::move(parameters_)),
+        expressionMetadata(expressionMetadata_),
        functionName(functionName_){};

  /** \brief Construct a behavior function call node. */
-  FunctionCallNode(const gd::String &objectName_,
+  FunctionCallNode(const gd::String &type_,
+                   const gd::String &objectName_,
                   const gd::String &behaviorName_,
+                   std::vector<std::unique_ptr<ExpressionNode>> parameters_,
+                   const ExpressionMetadata &expressionMetadata_,
                   const gd::String &functionName_)
-      : FunctionCallOrObjectFunctionNameOrEmptyNode(),
+      : FunctionCallOrObjectFunctionNameOrEmptyNode(type_),
        objectName(objectName_),
        behaviorName(behaviorName_),
+        parameters(std::move(parameters_)),
+        expressionMetadata(expressionMetadata_),
        functionName(functionName_){};
  virtual ~FunctionCallNode(){};
  virtual void Visit(ExpressionParser2NodeWorker &worker) {
@@ -390,6 +376,7 @@ struct GD_CORE_API FunctionCallNode : public FunctionCallOrObjectFunctionNameOrE
  gd::String objectName;
  gd::String behaviorName;
  std::vector<std::unique_ptr<ExpressionNode>> parameters;
+  const ExpressionMetadata &expressionMetadata;
  gd::String functionName;

  ExpressionParserLocation
@@ -414,8 +401,8 @@ struct GD_CORE_API FunctionCallNode : public FunctionCallOrObjectFunctionNameOrE
 * encountered and any other node could not make sense.
 */
 struct GD_CORE_API EmptyNode : public FunctionCallOrObjectFunctionNameOrEmptyNode {
-  EmptyNode(const gd::String &text_ = "")
-      : FunctionCallOrObjectFunctionNameOrEmptyNode(), text(text_){};
+  EmptyNode(const gd::String &type_, const gd::String &text_ = "")
+      : FunctionCallOrObjectFunctionNameOrEmptyNode(type_), text(text_){};
  virtual ~EmptyNode(){};
  virtual void Visit(ExpressionParser2NodeWorker &worker) {
    worker.OnVisitEmptyNode(*this);
--- a/Core/GDCore/Events/Parsers/ExpressionParser2NodePrinter.h
+++ b/Core/GDCore/Events/Parsers/ExpressionParser2NodePrinter.h
@@ -8,7 +8,6 @@

 #include <memory>
 #include <vector>
-
 #include "GDCore/Events/Parsers/ExpressionParser2Node.h"
 #include "GDCore/Events/Parsers/ExpressionParser2NodeWorker.h"
 namespace gd {
@@ -44,11 +43,6 @@ class GD_CORE_API ExpressionParser2NodePrinter
   */
  const gd::String& GetOutput() { return output; };

-  static gd::String PrintStringLiteral(const gd::String& str) {
-    return "\"" +
-           str.FindAndReplace("\\", "\\\\").FindAndReplace("\"", "\\\"") + "\"";
-  }
-
 protected:
  void OnVisitSubExpressionNode(SubExpressionNode& node) override {
    output += "(";
@@ -75,7 +69,10 @@ class GD_CORE_API ExpressionParser2NodePrinter
  }
  void OnVisitNumberNode(NumberNode& node) override { output += node.number; }
  void OnVisitTextNode(TextNode& node) override {
-    output += PrintStringLiteral(node.text);
+    output +=
+        "\"" +
+        node.text.FindAndReplace("\\", "\\\\").FindAndReplace("\"", "\\\"") +
+        "\"";
  }
  void OnVisitVariableNode(VariableNode& node) override {
    output += node.name;
@@ -94,14 +91,11 @@ class GD_CORE_API ExpressionParser2NodePrinter
  }
  void OnVisitIdentifierNode(IdentifierNode& node) override {
    output += node.identifierName;
-    if (!node.childIdentifierName.empty()) {
-      output += "." + node.childIdentifierName;
-    }
  }
  void OnVisitObjectFunctionNameNode(ObjectFunctionNameNode& node) override {
    if (!node.behaviorFunctionName.empty()) {
-      output += node.objectName + "." + node.objectFunctionOrBehaviorName +
-                "::" + node.behaviorFunctionName;
+      output +=
+          node.objectName + "." + node.objectFunctionOrBehaviorName + "::" + node.behaviorFunctionName;
    } else {
      output += node.objectName + "." + node.objectFunctionOrBehaviorName;
    }
--- a/Core/GDCore/Events/Parsers/GrammarTerminals.h
+++ b/Core/GDCore/Events/Parsers/GrammarTerminals.h
@@ -1,118 +0,0 @@
-#pragma once
-#include "GDCore/String.h"
-
-namespace gd {
-
-/**
- * Contains functions to handle the grammar of the expressions accepted by GDevelop.
- */
-namespace GrammarTerminals {
-
-inline bool IsWhitespace(gd::String::value_type character) {
-  return character == ' ' || character == '\n' || character == '\r';
-}
-
-inline bool IsParameterSeparator(gd::String::value_type character) {
-  return character == ',';
-}
-
-inline bool IsDot(gd::String::value_type character) { return character == '.'; }
-
-inline bool IsQuote(gd::String::value_type character) {
-  return character == '"';
-}
-
-inline bool IsBracket(gd::String::value_type character) {
-  return character == '(' || character == ')' || character == '[' ||
-         character == ']' || character == '{' || character == '}';
-}
-
-inline bool IsOpeningParenthesis(gd::String::value_type character) {
-  return character == '(';
-}
-
-inline bool IsClosingParenthesis(gd::String::value_type character) {
-  return character == ')';
-}
-
-inline bool IsOpeningSquareBracket(gd::String::value_type character) {
-  return character == '[';
-}
-
-inline bool IsClosingSquareBracket(gd::String::value_type character) {
-  return character == ']';
-}
-
-inline bool IsExpressionEndingChar(gd::String::value_type character) {
-  return character == ',' || IsClosingParenthesis(character) ||
-         IsClosingSquareBracket(character);
-}
-
-inline bool IsExpressionOperator(gd::String::value_type character) {
-  return character == '+' || character == '-' || character == '<' ||
-         character == '>' || character == '?' || character == '^' ||
-         character == '=' || character == '\\' || character == ':' ||
-         character == '!';
-}
-
-inline bool IsUnaryOperator(gd::String::value_type character) {
-  return character == '+' || character == '-';
-}
-
-inline bool IsTermOperator(gd::String::value_type character) {
-  return character == '/' || character == '*';
-}
-
-inline bool IsNumberFirstChar(gd::String::value_type character) {
-  return character == '.' || (character >= '0' && character <= '9');
-}
-
-inline bool IsNonZeroDigit(gd::String::value_type character) {
-  return (character >= '1' && character <= '9');
-}
-
-inline bool IsZeroDigit(gd::String::value_type character) {
-  return character == '0';
-}
-
-inline bool IsAdditionalReservedCharacter(gd::String::value_type character) {
-  // These characters are not part of the grammar - but are often used in programming language
-  // and could become operators or part of the grammar one day.
-  return character == '~' || character == '\'' || character == '%' ||
-         character == '#' || character == '@' || character == '|' ||
-         character == '&' || character == '`' || character == '$' ||
-         character == ';';
-
-}
-
-/**
- * Check if the given character can be used in an identifier. This is
- * any unicode character, except for:
- * `, . " () [] {} + - < > ? ^ = \ : ! / * ~ ' % # @ | & $ ;`
- * and backtick and whitespaces (space, line break, carriage return).
- *
- * This is loosely based on what is allowed in languages like JavaScript
- * (see https://mathiasbynens.be/notes/javascript-properties), without support
- * for unicode escape syntax, and allowing all unicode ranges. The only
- * disallowed characters are the one used for the grammar.
- */
-inline bool IsAllowedInIdentifier(gd::String::value_type character) {
-  // Quickly compare if the character is a number or ASCII character.
-  if ((character >= '0' && character <= '9') ||
-      (character >= 'A' && character <= 'Z') ||
-      (character >= 'a' && character <= 'z'))
-    return true;
-
-  // Otherwise do the full check against separators forbidden in identifiers.
-  if (!IsParameterSeparator(character) && !IsDot(character) &&
-      !IsQuote(character) && !IsBracket(character) &&
-      !IsExpressionOperator(character) && !IsTermOperator(character) &&
-      !IsWhitespace(character) && !IsAdditionalReservedCharacter(character)) {
-    return true;
-  }
-
-  return false;
-}
-
-}  // namespace GrammarTerminals
-}  // namespace gd
--- a/Core/GDCore/Events/Serialization.cpp
+++ b/Core/GDCore/Events/Serialization.cpp
@@ -4,7 +4,6 @@
 * reserved. This project is released under the MIT License.
 */
 #include "GDCore/Events/Serialization.h"
-
 #include "GDCore/CommonTools.h"
 #include "GDCore/Events/Event.h"
 #include "GDCore/Events/EventsList.h"
@@ -184,8 +183,8 @@ void EventsListSerialization::UpdateInstructionsFromGD2x(
    for (std::size_t j = 0;
         j < parameters.size() && j < metadata.parameters.size();
         ++j) {
-      if (metadata.parameters[j].GetType() == "relationalOperator" ||
-          metadata.parameters[j].GetType() == "operator") {
+      if (metadata.parameters[j].type == "relationalOperator" ||
+          metadata.parameters[j].type == "operator") {
        if (j == parameters.size() - 1) {
          std::cout << "ERROR: No more parameters after a [relational]operator "
                       "when trying to update an instruction from GD2.x";
@@ -219,8 +218,8 @@ void EventsListSerialization::UnserializeEventsFrom(
      event = std::make_shared<EmptyEvent>();
    }

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

    list.InsertEvent(event, list.GetEventsCount());
  }
@@ -233,9 +232,8 @@ void EventsListSerialization::SerializeEventsTo(const EventsList& list,
    const gd::BaseEvent& event = list.GetEvent(j);
    SerializerElement& eventElem = events.AddChild("event");

-    if (event.IsDisabled())
-      eventElem.SetAttribute("disabled", event.IsDisabled());
-    if (event.IsFolded()) eventElem.SetAttribute("folded", event.IsFolded());
+    eventElem.SetAttribute("disabled", event.IsDisabled());
+    eventElem.SetAttribute("folded", event.IsFolded());
    eventElem.AddChild("type").SetValue(event.GetType());

    event.SerializeTo(eventElem);
@@ -269,9 +267,6 @@ void gd::EventsListSerialization::UnserializeInstructionsFrom(
        instrElement.GetChild("type", 0, "Type")
            .GetBoolAttribute("inverted", false, "Contraire"));

-    instruction.SetAwaited(
-        instrElement.GetChild("type", 0, "Type").GetBoolAttribute("await"));
-
    // Read parameters
    vector<gd::Expression> parameters;

@@ -345,12 +340,9 @@ void gd::EventsListSerialization::SerializeInstructionsTo(
  instructions.ConsiderAsArrayOf("instruction");
  for (std::size_t k = 0; k < list.size(); k++) {
    SerializerElement& instruction = instructions.AddChild("instruction");
-    instruction.AddChild("type").SetAttribute("value", list[k].GetType());
-
-    if (list[k].IsInverted())
-      instruction.GetChild("type").SetAttribute("inverted", true);
-    if (list[k].IsAwaited())
-      instruction.GetChild("type").SetAttribute("await", true);
+    instruction.AddChild("type")
+        .SetAttribute("value", list[k].GetType())
+        .SetAttribute("inverted", list[k].IsInverted());

    // Parameters
    SerializerElement& parameters = instruction.AddChild("parameters");
@@ -360,10 +352,9 @@ void gd::EventsListSerialization::SerializeInstructionsTo(
          .SetValue(list[k].GetParameter(l).GetPlainString());

    // Sub instructions
-    if (!list[k].GetSubInstructions().empty()) {
-      SerializeInstructionsTo(list[k].GetSubInstructions(),
-                              instruction.AddChild("subInstructions"));
-    }
+    SerializerElement& subInstructions =
+        instruction.AddChild("subInstructions");
+    SerializeInstructionsTo(list[k].GetSubInstructions(), subInstructions);
  }
 }

--- a/Core/GDCore/Events/Tools/EventsCodeNameMangler.cpp
+++ b/Core/GDCore/Events/Tools/EventsCodeNameMangler.cpp
@@ -17,7 +17,7 @@ const gd::String& EventsCodeNameMangler::GetMangledObjectsListName(
    return it->second;
  }

-  gd::String partiallyMangledName = GetMangledNameWithForbiddenUnderscore(originalObjectName);
+  gd::String partiallyMangledName = originalObjectName;
  static const gd::String allowedCharacters =
      "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";

@@ -43,15 +43,7 @@ const gd::String& EventsCodeNameMangler::GetExternalEventsFunctionMangledName(
    return it->second;
  }

-  gd::String partiallyMangledName = GetMangledNameWithForbiddenUnderscore(externalEventsName);
-
-  mangledExternalEventsNames[externalEventsName] = "GDExternalEvents" + partiallyMangledName;
-  return mangledExternalEventsNames[externalEventsName];
-}
-
-gd::String EventsCodeNameMangler::GetMangledNameWithForbiddenUnderscore(
-    const gd::String &name) {
-  gd::String partiallyMangledName = name;
+  gd::String partiallyMangledName = externalEventsName;
  static const gd::String allowedCharacters =
      "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";

@@ -65,30 +57,11 @@ gd::String EventsCodeNameMangler::GetMangledNameWithForbiddenUnderscore(
      partiallyMangledName.replace(i, 1, "_" + gd::String::From(unallowedChar));
    }
  }
-  return partiallyMangledName;
+
+  mangledExternalEventsNames[externalEventsName] = "GDExternalEvents" + partiallyMangledName;
+  return mangledExternalEventsNames[externalEventsName];
 }

-gd::String EventsCodeNameMangler::GetMangledName(
-    const gd::String &name) {
-  gd::String partiallyMangledName = name;
-  static const gd::String allowedCharacters =
-      "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_";
-
-  for (size_t i = 0; i < partiallyMangledName.size();
-       ++i)  // Replace all unallowed letter by an underscore and the ascii
-             // number of the letter
-  {
-    if (allowedCharacters.find_first_of(
-            std::u32string(1, partiallyMangledName[i])) == gd::String::npos) {
-      char32_t unallowedChar = partiallyMangledName[i];
-      partiallyMangledName.replace(i, 1, "_" + gd::String::From(unallowedChar));
-    }
-  }
-  return partiallyMangledName;
-}
-
-
-
 const gd::String& ManObjListName(const gd::String &objectName) {
  return EventsCodeNameMangler::Get()->GetMangledObjectsListName(objectName);
 }
--- a/Core/GDCore/Events/Tools/EventsCodeNameMangler.h
+++ b/Core/GDCore/Events/Tools/EventsCodeNameMangler.h
@@ -36,8 +36,6 @@ class GD_CORE_API EventsCodeNameMangler {
  const gd::String &GetExternalEventsFunctionMangledName(
      const gd::String &externalEventsName);

-  static gd::String GetMangledName(const gd::String &name);
-
  static EventsCodeNameMangler *Get();
  static void DestroySingleton();

@@ -46,9 +44,6 @@ class GD_CORE_API EventsCodeNameMangler {
  virtual ~EventsCodeNameMangler(){};
  static EventsCodeNameMangler *_singleton;

-  // This method is inlined to avoid to copy the returned string.
-  static inline gd::String GetMangledNameWithForbiddenUnderscore(const gd::String &name);
-
  std::unordered_map<gd::String, gd::String>
      mangledObjectNames;  ///< Memoized results of mangling for objects
  std::unordered_map<gd::String, gd::String>
--- a/Core/GDCore/Extensions/Builtin/AdvancedExtension.cpp
+++ b/Core/GDCore/Extensions/Builtin/AdvancedExtension.cpp
@@ -33,8 +33,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAdvancedExtension(
          "res/function32.png",
          "res/function32.png")
      .SetHelpPath("/events/functions/return")
-      .AddParameter("expression", _("The number to be returned"))
-      .SetRelevantForFunctionEventsOnly()
+      .AddParameter("expression", "The number to be returned")
      .MarkAsAdvanced();

  extension
@@ -48,8 +47,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAdvancedExtension(
          "res/function32.png",
          "res/function32.png")
      .SetHelpPath("/events/functions/return")
-      .AddParameter("string", _("The text to be returned"))
-      .SetRelevantForFunctionEventsOnly()
+      .AddParameter("string", "The text to be returned")
      .MarkAsAdvanced();

  extension
@@ -62,38 +60,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAdvancedExtension(
                 "res/function32.png",
                 "res/function32.png")
      .SetHelpPath("/events/functions/return")
-      .AddParameter("trueorfalse", _("Should the condition be true or false?"))
-      .SetRelevantForFunctionEventsOnly()
-      .MarkAsAdvanced();
-
-  extension
-      .AddAction("CopyArgumentToVariable",
-                 _("Copy function parameter to variable"),
-                 _("Copy a function parameter (also called \"argument\") to a variable. "
-                 "The parameter type must be a variable."),
-                 _("Copy the parameter _PARAM0_ into the variable _PARAM1_"),
-                 "",
-                 "res/function32.png",
-                 "res/function32.png")
-      .SetHelpPath("/events/functions/return")
-      .AddParameter("functionParameterName", _("Parameter name"), "variable")
-      .AddParameter("scenevar", _("Scene variable"))
-      .SetRelevantForFunctionEventsOnly()
-      .MarkAsAdvanced();
-
-  extension
-      .AddAction("CopyVariableToArgument",
-                 _("Copy variable to function parameter"),
-                 _("Copy a variable to function parameter (also called \"argument\"). "
-                 "The parameter type must be a variable."),
-                 _("Copy the variable _PARAM1_ into the parameter _PARAM0_"),
-                 "",
-                 "res/function32.png",
-                 "res/function32.png")
-      .SetHelpPath("/events/functions/return")
-      .AddParameter("functionParameterName", _("Parameter name"), "variable")
-      .AddParameter("scenevar", _("Scene variable"))
-      .SetRelevantForFunctionEventsOnly()
+      .AddParameter("trueorfalse", "Should the condition be true or false?")
      .MarkAsAdvanced();

  extension
@@ -107,59 +74,26 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAdvancedExtension(
                    "",
                    "res/function32.png",
                    "res/function32.png")
-      .AddParameter("functionParameterName", _("Parameter name"), "number,string,boolean")
-      .SetRelevantForFunctionEventsOnly()
+      .AddParameter("functionParameterName", "Parameter name")
      .MarkAsAdvanced();

  extension
      .AddExpression(
          "GetArgumentAsNumber",
          _("Get function parameter value"),
-          _("Get function parameter (also called \"argument\") value. You don't need this most of the time as you can simply write the parameter name in an expression."),
+          _("Get function parameter (also called \"argument\") value"),
          "",
          "res/function16.png")
-      .AddParameter("functionParameterName", _("Parameter name"), "number,string,boolean")
-      .SetRelevantForFunctionEventsOnly()
-      .SetHidden();
+      .AddParameter("functionParameterName", "Parameter name");

  extension
      .AddStrExpression(
          "GetArgumentAsString",
          _("Get function parameter text"),
-          _("Get function parameter (also called \"argument\") text. You don't need this most of the time as you can simply write the parameter name in an expression."),
+          _("Get function parameter (also called \"argument\") text "),
          "",
          "res/function16.png")
-      .AddParameter("functionParameterName", _("Parameter name"), "number,string,boolean")
-      .SetRelevantForFunctionEventsOnly()
-      .SetHidden();
-
-  extension
-      .AddCondition(
-          "CompareArgumentAsNumber",
-          _("Compare function parameter value"),
-          _("Compare function parameter (also called \"argument\") value."),
-          _("Parameter _PARAM0_"),
-          "",
-          "res/function32.png",
-          "res/function16.png")
-      .AddParameter("functionParameterName", _("Parameter name"), "number,string,boolean")
-      .UseStandardRelationalOperatorParameters(
-          "number", gd::ParameterOptions::MakeNewOptions())
-      .SetRelevantForFunctionEventsOnly();
-
-  extension
-      .AddCondition(
-          "CompareArgumentAsString",
-          _("Compare function parameter text"),
-          _("Compare function parameter (also called \"argument\") text."),
-          _("Parameter _PARAM0_"),
-          "",
-          "res/function32.png",
-          "res/function16.png")
-      .AddParameter("functionParameterName", _("Parameter name"), "number,string,boolean")
-      .UseStandardRelationalOperatorParameters(
-          "string", gd::ParameterOptions::MakeNewOptions())
-      .SetRelevantForFunctionEventsOnly();
+      .AddParameter("functionParameterName", "Parameter name");
 }

 }  // namespace gd
--- a/Core/GDCore/Extensions/Builtin/AllBuiltinExtensions.h
+++ b/Core/GDCore/Extensions/Builtin/AllBuiltinExtensions.h
@@ -42,14 +42,6 @@ class GD_CORE_API BuiltinExtensionsImplementer {
  static void ImplementsTimeExtension(gd::PlatformExtension& extension);
  static void ImplementsVariablesExtension(gd::PlatformExtension& extension);
  static void ImplementsWindowExtension(gd::PlatformExtension& extension);
-  static void ImplementsAsyncExtension(gd::PlatformExtension& extension);
-  static void ImplementsResizableExtension(gd::PlatformExtension& extension);
-  static void ImplementsScalableExtension(gd::PlatformExtension& extension);
-  static void ImplementsFlippableExtension(gd::PlatformExtension& extension);
-  static void ImplementsAnimatableExtension(gd::PlatformExtension& extension);
-  static void ImplementsEffectExtension(gd::PlatformExtension& extension);
-  static void ImplementsOpacityExtension(gd::PlatformExtension& extension);
-  static void ImplementsTextContainerExtension(gd::PlatformExtension& extension);
 };

 }  // namespace gd
--- a/Core/GDCore/Extensions/Builtin/AsyncExtension.cpp
+++ b/Core/GDCore/Extensions/Builtin/AsyncExtension.cpp
@@ -1,47 +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 "AllBuiltinExtensions.h"
-#include "GDCore/Events/Builtin/AsyncEvent.h"
-#include "GDCore/Tools/Localization.h"
-
-using namespace std;
-namespace gd {
-
-void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAsyncExtension(
-    gd::PlatformExtension &extension) {
-  extension
-      .SetExtensionInformation(
-          "BuiltinAsync",
-          _("Asynchronous functions"),
-          _("Functions that defer the execution of the events after it."),
-          "Arthur Pacaud (arthuro555)",
-          "Open source (MIT License)")
-      .SetCategory("Advanced");
-  extension.AddInstructionOrExpressionGroupMetadata(_("Asynchronous functions"))
-      .SetIcon("res/function32.png");
-
-  extension.AddEvent("Async",
-                     _("Async event"),
-                     _("Internal event for asynchronous actions"),
-                     "",
-                     "res/eventaddicon.png",
-                     std::make_shared<gd::AsyncEvent>());
-
-  extension
-      .AddAction(
-          "ResolveAsyncEventsFunction",
-          _("End asynchronous function"),
-          _("Mark an asynchronous function as finished. This will allow the "
-            "actions and subevents following it to be run."),
-          "Mark asynchronous function as ended",
-          "",
-          "res/actions/quit24.png",
-          "res/actions/quit.png")
-      .AddCodeOnlyParameter("eventsFunctionContext", "")
-      .SetRelevantForAsynchronousFunctionEventsOnly();
-}
-
-}  // namespace gd
--- a/Core/GDCore/Extensions/Builtin/AudioExtension.cpp
+++ b/Core/GDCore/Extensions/Builtin/AudioExtension.cpp
@@ -14,17 +14,15 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
  extension
      .SetExtensionInformation(
          "BuiltinAudio",
-          _("Sounds and music"),
+          _("Sounds and musics"),
          _("GDevelop provides several conditions and actions to play audio "
-            "files. They can be either long music or short sound effects."),
+            "files. They can be either long musics or short sound effects."),
          "Florian Rival",
          "Open source (MIT License)")
      .SetExtensionHelpPath("/all-features/audio")
      .SetCategory("Audio");
-  extension.AddInstructionOrExpressionGroupMetadata(_("Sounds and music"))
+  extension.AddInstructionOrExpressionGroupMetadata(_("Sounds and musics"))
      .SetIcon("res/actions/music24.png");
-  extension.AddInstructionOrExpressionGroupMetadata(_("Sounds on channels"))
-      .SetIcon("res/actions/son24.png");

  extension
      .AddAction("PlaySoundCanal",
@@ -75,9 +73,9 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(

  extension
      .AddAction("RePlaySoundCanal",
-                 _("Resume playing a sound on a channel"),
-                 _("Resume playing a sound on a channel that was paused."),
-                 _("Resume the sound of channel _PARAM1_"),
+                 _("Play the sound of a channel"),
+                 _("Play the sound of the channel."),
+                 _("Play the sound of channel _PARAM1_"),
                 _("Sounds on channels"),
                 "res/actions/son24.png",
                 "res/actions/son.png")
@@ -134,9 +132,9 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(

  extension
      .AddAction("RePlayMusicCanal",
-                 _("Resume playing a music on a channel"),
-                 _("Resume playing a music on a channel that was paused."),
-                 _("Resume the music of channel _PARAM1_"),
+                 _("Play the music of a channel"),
+                 _("Play the music of the channel."),
+                 _("Play the music of channel _PARAM1_"),
                 _("Music on channels"),
                 "res/actions/music24.png",
                 "res/actions/music.png")
@@ -148,83 +146,69 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
      .AddAction("ModVolumeSoundCanal",
                 _("Volume of the sound on a channel"),
                 _("This action modifies the volume of the sound on the "
-                   "specified channel."),
+                   "specified channel. The volume is between 0 and 100."),
                 _("the volume of the sound on channel _PARAM1_"),
                 _("Sounds on channels"),
                 "res/actions/sonVolume24.png",
                 "res/actions/sonVolume.png")
      .AddCodeOnlyParameter("currentScene", "")
      .AddParameter("expression", _("Channel identifier"))
-      .UseStandardOperatorParameters(
-          "number",
-          ParameterOptions::MakeNewOptions().SetDescription(
-              _("Volume (0-100)")))
+      .UseStandardOperatorParameters("number")
      .MarkAsAdvanced();

  extension
      .AddAction("ModVolumeMusicCanal",
                 _("Volume of the music on a channel"),
                 _("This action modifies the volume of the music on the "
-                   "specified channel."),
+                   "specified channel. The volume is between 0 and 100."),
                 _("the volume of the music on channel _PARAM1_"),
                 _("Music on channels"),
                 "res/actions/musicVolume24.png",
                 "res/actions/musicVolume.png")
      .AddCodeOnlyParameter("currentScene", "")
      .AddParameter("expression", _("Channel identifier"))
-      .UseStandardOperatorParameters(
-          "number",
-          ParameterOptions::MakeNewOptions().SetDescription(
-              _("Volume (0-100)")))
+      .UseStandardOperatorParameters("number")
      .MarkAsAdvanced();

  extension
      .AddAction("ModGlobalVolume",
                 _("Game global volume"),
-                 _("This action modifies the global volume of the game."),
+                 _("This action modifies the global volume of the game. The "
+                   "volume is between 0 and 100."),
                 _("the global sound level"),
                 "",
                 "res/actions/volume24.png",
                 "res/actions/volume.png")
      .AddCodeOnlyParameter("currentScene", "")
-      .UseStandardOperatorParameters(
-          "number",
-          ParameterOptions::MakeNewOptions().SetDescription(
-              _("Volume (0-100)")))
+      .UseStandardOperatorParameters("number")
      .MarkAsSimple();

  extension
      .AddAction("ModPitchSoundChannel",
                 _("Pitch of the sound of a channel"),
                 _("This action modifies the pitch (speed) of the sound on a "
-                   "channel."),
+                   "channel.\n1 is the default pitch."),
                 _("the pitch of the sound on channel _PARAM1_"),
                 _("Sounds on channels"),
                 "res/actions/son24.png",
                 "res/actions/son.png")
      .AddCodeOnlyParameter("currentScene", "")
      .AddParameter("expression", _("Channel identifier"))
-      .UseStandardOperatorParameters(
-          "number",
-          ParameterOptions::MakeNewOptions().SetDescription(
-              _("Pitch (1 by default)")))
+      .UseStandardOperatorParameters("number")
      .MarkAsAdvanced();

  extension
      .AddAction("ModPitchMusicChannel",
                 _("Pitch of the music on a channel"),
                 _("This action modifies the pitch of the music on the "
-                   "specified channel."),
+                   "specified channel. 1 is the default pitch"),
                 _("the pitch of the music on channel _PARAM1_"),
                 _("Music on channels"),
                 "res/actions/music24.png",
                 "res/actions/music.png")
      .AddCodeOnlyParameter("currentScene", "")
      .AddParameter("expression", _("Channel identifier"))
-      .UseStandardOperatorParameters(
-          "number",
-          ParameterOptions::MakeNewOptions().SetDescription(
-              _("Pitch (1 by default)")))
+      .UseStandardOperatorParameters("number")
      .MarkAsAdvanced();

  extension
@@ -238,10 +222,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
                 "res/actions/son.png")
      .AddCodeOnlyParameter("currentScene", "")
      .AddParameter("expression", _("Channel identifier"))
-      .UseStandardOperatorParameters(
-          "number",
-          ParameterOptions::MakeNewOptions().SetDescription(
-              _("Position (in seconds)")))
+      .UseStandardOperatorParameters("number")
      .MarkAsAdvanced();

  extension
@@ -255,10 +236,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
                 "res/actions/music.png")
      .AddCodeOnlyParameter("currentScene", "")
      .AddParameter("expression", _("Channel identifier"))
-      .UseStandardOperatorParameters(
-          "number",
-          ParameterOptions::MakeNewOptions().SetDescription(
-              _("Position (in seconds)")))
+      .UseStandardOperatorParameters("number")
      .MarkAsAdvanced();

  extension
@@ -365,34 +343,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
          "res/actions/music.png")
      .AddCodeOnlyParameter("currentScene", "")
      .MarkAsComplex();
-  extension
-      .AddAction(
-          "FadeSoundVolume",
-          _("Fade the volume of a sound played on a channel."),
-          _("Fade the volume of a sound played on a channel to the specified volume within the specified duration."),
-          _("Fade the sound on channel _PARAM1_ to volume _PARAM2_ within _PARAM3_ seconds"),
-          _("Sounds on channels"),
-          "res/actions/son24.png",
-          "res/actions/son.png")
-      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("expression", _("Channel identifier"))
-      .AddParameter("expression", _("Final volume (0-100)"))
-      .AddParameter("expression", _("Fading time in seconds"))
-      .MarkAsAdvanced();
-  extension
-      .AddAction(
-          "FadeMusicVolume",
-          _("Fade the volume of a music played on a channel."),
-          _("Fade the volume of a music played on a channel to the specified volume within the specified duration."),
-          _("Fade the music on channel _PARAM1_ to volume _PARAM2_ within _PARAM3_ seconds"),
-          _("Music on channels"),
-          "res/actions/music24.png",
-          "res/actions/music.png")
-      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("expression", _("Channel identifier"))
-      .AddParameter("expression", _("Final volume (0-100)"))
-      .AddParameter("expression", _("Fading time in seconds"))
-      .MarkAsAdvanced();

  extension
      .AddCondition("MusicPlaying",
@@ -470,17 +420,15 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
      .AddCondition(
          "SoundCanalVolume",
          _("Volume of the sound on a channel"),
-          _("Test the volume of the sound on the specified channel."),
+          _("Test the volume of the sound on the specified channel. The volume "
+            "is between 0 and 100."),
          _("the volume of the sound on channel _PARAM1_"),
          _("Sounds on channels"),
          "res/conditions/sonVolume24.png",
          "res/conditions/sonVolume.png")
      .AddCodeOnlyParameter("currentScene", "")
      .AddParameter("expression", _("Channel identifier"))
-      .UseStandardRelationalOperatorParameters(
-          "number",
-          ParameterOptions::MakeNewOptions().SetDescription(
-              _("Volume to compare to (0-100)")))
+      .UseStandardRelationalOperatorParameters("number")
      .MarkAsAdvanced();

  extension
@@ -495,10 +443,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
          "res/conditions/musicVolume.png")
      .AddCodeOnlyParameter("currentScene", "")
      .AddParameter("expression", _("Channel identifier"))
-      .UseStandardRelationalOperatorParameters(
-          "number",
-          ParameterOptions::MakeNewOptions().SetDescription(
-              _("Volume to compare to (0-100)")))
+      .UseStandardRelationalOperatorParameters("number")
      .MarkAsAdvanced();

  extension
@@ -511,10 +456,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
          "res/conditions/volume24.png",
          "res/conditions/volume.png")
      .AddCodeOnlyParameter("currentScene", "")
-      .UseStandardRelationalOperatorParameters(
-          "number",
-          ParameterOptions::MakeNewOptions().SetDescription(
-              _("Volume to compare to (0-100)")));
+      .UseStandardRelationalOperatorParameters("number");

  extension
      .AddCondition(
@@ -528,27 +470,22 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
          "res/conditions/sonVolume.png")
      .AddCodeOnlyParameter("currentScene", "")
      .AddParameter("expression", _("Channel identifier"))
-      .UseStandardRelationalOperatorParameters(
-          "number",
-          ParameterOptions::MakeNewOptions().SetDescription(
-              _("Pitch to compare to (1 by default)")))
+      .UseStandardRelationalOperatorParameters("number")
      .MarkAsAdvanced();

  extension
      .AddCondition(
          "MusicChannelPitch",
          _("Pitch of the music on a channel"),
-          _("Test the pitch (speed) of the music on a specified channel."),
+          _("Test the pitch (speed) of the music on a specified channel. 1 is "
+            "the default pitch."),
          _("the pitch of the music on channel _PARAM1_"),
          _("Music on channels"),
          "res/conditions/musicVolume24.png",
          "res/conditions/musicVolume.png")
      .AddCodeOnlyParameter("currentScene", "")
      .AddParameter("expression", _("Channel identifier"))
-      .UseStandardRelationalOperatorParameters(
-          "number",
-          ParameterOptions::MakeNewOptions().SetDescription(
-              _("Pitch to compare to (1 by default)")))
+      .UseStandardRelationalOperatorParameters("number")
      .MarkAsAdvanced();

  extension
@@ -562,10 +499,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
          "res/conditions/sonVolume.png")
      .AddCodeOnlyParameter("currentScene", "")
      .AddParameter("expression", _("Channel identifier"))
-      .UseStandardRelationalOperatorParameters(
-          "number",
-          ParameterOptions::MakeNewOptions().SetDescription(
-              _("Position to compare to (in seconds)")))
+      .UseStandardRelationalOperatorParameters("number")
      .MarkAsAdvanced();

  extension
@@ -579,10 +513,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(
          "res/conditions/musicVolume.png")
      .AddCodeOnlyParameter("currentScene", "")
      .AddParameter("expression", _("Channel identifier"))
-      .UseStandardRelationalOperatorParameters(
-          "number",
-          ParameterOptions::MakeNewOptions().SetDescription(
-              _("Position to compare to (in seconds)")))
+      .UseStandardRelationalOperatorParameters("number")
      .MarkAsAdvanced();

  extension
--- a/Core/GDCore/Extensions/Builtin/BaseObjectExtension.cpp
+++ b/Core/GDCore/Extensions/Builtin/BaseObjectExtension.cpp
--- a/Core/GDCore/Extensions/Builtin/CameraExtension.cpp
+++ b/Core/GDCore/Extensions/Builtin/CameraExtension.cpp
@@ -22,76 +22,53 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
          "object or a position.",
          "Florian Rival",
          "Open source (MIT License)")
-      .SetCategory("Camera")
      .SetExtensionHelpPath("/interface/scene-editor/layers-and-cameras");
  extension.AddInstructionOrExpressionGroupMetadata(_("Layers and cameras"))
      .SetIcon("res/conditions/camera24.png");
-  extension.AddInstructionOrExpressionGroupMetadata(_("Effects"))
-      .SetIcon("res/actions/effect24.png");

  extension
      .AddExpressionAndConditionAndAction(
          "number",
-          "CameraCenterX",
+          "CameraX",
          _("Camera center X position"),
          _("the X position of the center of a camera"),
          _("the X position of camera _PARAM4_ (layer: _PARAM3_)"),
          "",
          "res/conditions/camera24.png")
      .AddCodeOnlyParameter("currentScene", "")
-      .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
-      .AddParameter("layer", _("Layer"), "", true)
+      .UseStandardParameters("number")
+      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
      .SetDefaultValue("\"\"")
      .AddParameter("expression", _("Camera number (default : 0)"), "", true)
      .SetDefaultValue("0")
      .MarkAsAdvanced();

-  // Compatibility with GD <= 5.0.135
-  extension.AddDuplicatedCondition("CameraX", "CameraCenterX")
-      .SetHidden();  // Deprecated
-  extension.AddDuplicatedExpression("CameraX", "CameraCenterX")
-      .SetHidden();  // Deprecated
-  extension.AddDuplicatedAction("SetCameraX", "SetCameraCenterX")
-      .SetHidden();  // Deprecated
-
  extension.AddDuplicatedAction("CameraX", "SetCameraX")
      .SetHidden();  // Deprecated
-
  extension.AddDuplicatedExpression("VueX", "CameraX")
      .SetHidden();  // Deprecated
-  // end of compatibility code

  extension
      .AddExpressionAndConditionAndAction(
          "number",
-          "CameraCenterY",
+          "CameraY",
          _("Camera center Y position"),
          _("the Y position of the center of a camera"),
          _("the Y position of camera _PARAM4_ (layer: _PARAM3_)"),
          "",
          "res/conditions/camera24.png")
      .AddCodeOnlyParameter("currentScene", "")
-      .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
-      .AddParameter("layer", _("Layer"), "", true)
+      .UseStandardParameters("number")
+      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
      .SetDefaultValue("\"\"")
      .AddParameter("expression", _("Camera number (default : 0)"), "", true)
      .SetDefaultValue("0")
      .MarkAsAdvanced();

-  // Compatibility with GD <= 5.0.135
-  extension.AddDuplicatedCondition("CameraY", "CameraCenterY")
-      .SetHidden();  // Deprecated
-  extension.AddDuplicatedExpression("CameraY", "CameraCenterY")
-      .SetHidden();  // Deprecated
-  extension.AddDuplicatedAction("SetCameraY", "SetCameraCenterY")
-      .SetHidden();  // Deprecated
-
  extension.AddDuplicatedAction("CameraY", "SetCameraY")
      .SetHidden();  // Deprecated
-
  extension.AddDuplicatedExpression("VueY", "CameraY")
      .SetHidden();  // Deprecated
-  // end of compatibility code

  extension
      .AddExpressionAndCondition(
@@ -103,10 +80,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
          "",
          "res/conditions/camera24.png")
      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer"), "", true)
+      .AddParameter("layer", _("Layer (base layer if empty)"))
      .SetDefaultValue("\"\"")
-      .AddParameter("expression", _("Camera number"), "", true)
-      .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
+      .AddParameter("expression", _("Camera number"))
+      .UseStandardParameters("number")
      .MarkAsAdvanced();

  extension
@@ -119,78 +96,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
          "",
          "res/conditions/camera24.png")
      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer"), "", true)
+      .AddParameter("layer", _("Layer (base layer if empty)"))
      .SetDefaultValue("\"\"")
-      .AddParameter("expression", _("Camera number"), "", true)
-      .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
-      .MarkAsAdvanced();
-
-  extension
-      .AddExpressionAndCondition(
-          "number",
-          "CameraBorderLeft",
-          _("Camera left border position"),
-          _("the position of the left border of a camera"),
-          _("the position of the left border of camera _PARAM2_ of layer "
-            "_PARAM1_"),
-          "",
-          "res/conditions/camera24.png")
-      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer"), "", true)
-      .SetDefaultValue("\"\"")
-      .AddParameter("expression", _("Camera number"), "", true)
-      .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
-      .MarkAsAdvanced();
-
-  extension
-      .AddExpressionAndCondition(
-          "number",
-          "CameraBorderRight",
-          _("Camera right border position"),
-          _("the position of the right border of a camera"),
-          _("the position of the right border of camera _PARAM2_ of layer "
-            "_PARAM1_"),
-          "",
-          "res/conditions/camera24.png")
-      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer"), "", true)
-      .SetDefaultValue("\"\"")
-      .AddParameter("expression", _("Camera number"), "", true)
-      .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
-      .MarkAsAdvanced();
-
-  extension
-      .AddExpressionAndCondition(
-          "number",
-          "CameraBorderTop",
-          _("Camera top border position"),
-          _("the position of the top border of a camera"),
-          _("the position of the top border of camera _PARAM2_ of layer "
-            "_PARAM1_"),
-          "",
-          "res/conditions/camera24.png")
-      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer"), "", true)
-      .SetDefaultValue("\"\"")
-      .AddParameter("expression", _("Camera number"), "", true)
-      .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
-      .MarkAsAdvanced();
-
-  extension
-      .AddExpressionAndCondition(
-          "number",
-          "CameraBorderBottom",
-          _("Camera bottom border position"),
-          _("the position of the bottom border of a camera"),
-          _("the position of the bottom border of camera _PARAM2_ of layer "
-            "_PARAM1_"),
-          "",
-          "res/conditions/camera24.png")
-      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer"), "", true)
-      .SetDefaultValue("\"\"")
-      .AddParameter("expression", _("Camera number"), "", true)
-      .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
+      .AddParameter("expression", _("Camera number"))
+      .UseStandardParameters("number")
      .MarkAsAdvanced();

  extension
@@ -198,13 +107,13 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
          "number",
          "CameraAngle",
          _("Angle of a camera of a layer"),
-          _("the angle of rotation of a camera (in degrees)"),
+          _("the angle of rotation of a camera"),
          _("the angle of camera (layer: _PARAM3_, camera: _PARAM4_)"),
          "",
          "res/conditions/camera24.png")
      .AddCodeOnlyParameter("currentScene", "")
-      .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
-      .AddParameter("layer", _("Layer"), "", true)
+      .UseStandardParameters("number")
+      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
      .SetDefaultValue("\"\"")
      .AddParameter("expression", _("Camera number (default : 0)"), "", true)
      .SetDefaultValue("0")
@@ -224,7 +133,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                 "res/actions/camera24.png",
                 "res/actions/camera.png")
      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer"))
+      .AddParameter("layer", _("Layer (base layer if empty)"))
      .SetDefaultValue("\"\"")
      .AddParameter("expression", _("Width"), "", true)
      .AddParameter("expression", _("Height"), "", true)
@@ -259,7 +168,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                 "res/actions/camera24.png",
                 "res/actions/camera.png")
      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer"))
+      .AddParameter("layer", _("Layer (base layer if empty)"))
      .SetDefaultValue("\"\"")
      .AddParameter("expression", _("Camera number"))
      .MarkAsComplex();
@@ -275,7 +184,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                 "res/actions/camera24.png",
                 "res/actions/camera.png")
      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer"))
+      .AddParameter("layer", _("Layer (base layer if empty)"))
      .SetDefaultValue("\"\"")
      .AddParameter("expression", _("Camera number"))
      .AddParameter("expression", _("Width"))
@@ -293,7 +202,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                 "res/actions/camera24.png",
                 "res/actions/camera.png")
      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer"))
+      .AddParameter("layer", _("Layer (base layer if empty)"))
      .SetDefaultValue("\"\"")
      .AddParameter("expression", _("Camera number"))
      .AddParameter(
@@ -312,7 +221,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(

  extension
      .AddAction("ZoomCamera",
-                 _("Camera zoom"),
+                 _("Change camera zoom"),
                 _("Change camera zoom."),
                 _("Change camera zoom to _PARAM1_ (layer: _PARAM2_, camera: "
                   "_PARAM3_)"),
@@ -322,11 +231,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
      .AddCodeOnlyParameter("currentScene", "")
      .AddParameter("expression",
                    _("Value (1:Initial zoom, 2:Zoom x2, 0.5:Unzoom x2...)"))
-      .AddParameter("layer", _("Layer"), "", true)
+      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
      .SetDefaultValue("\"\"")
      .AddParameter("expression", _("Camera number (default : 0)"), "", true)
      .SetDefaultValue("0");

+  // TODO Deprecated: hide this action in a future release.
  extension
      .AddAction(
          "FixCamera",
@@ -338,7 +248,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
          "",
          "res/actions/camera24.png",
          "res/actions/camera.png")
-      .SetHidden()
      .AddCodeOnlyParameter("currentScene", "")
      .AddParameter("objectPtr", _("Object"))
      .AddParameter("expression",
@@ -354,41 +263,46 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                    "",
                    true)
      .SetDefaultValue("yes")
-      .AddParameter("layer", _("Layer"), "", true)
+      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
      .SetDefaultValue("\"\"")
      .AddParameter("expression", _("Camera number (default : 0)"), "", true)
      .SetDefaultValue("0")
      .MarkAsAdvanced();

  extension
-      .AddAction("ClampCamera",
-                 _("Enforce camera boundaries"),
-                 _("Enforce camera boundaries by moving the camera back inside "
-                   "specified boundaries."),
-                 _("Enforce camera boundaries (left: _PARAM1_, top: _PARAM2_ "
-                   "right: _PARAM3_, bottom: _PARAM4_, layer: _PARAM5_)"),
-                 "",
-                 "res/actions/camera24.png",
-                 "res/actions/camera.png")
+      .AddAction(
+          "ClampCamera",
+          _("Enforce camera boundaries"),
+          _("Enforce camera boundaries by moving the camera back inside specified boundaries."),
+          _("Enforce camera boundaries (left: _PARAM1_, top: _PARAM2_ "
+            "right: _PARAM3_, bottom: _PARAM4_, layer: _PARAM5_)"),
+          "",
+          "res/actions/camera24.png",
+          "res/actions/camera.png")
      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("expression", _("Left bound X Position"))
-      .AddParameter("expression", _("Top bound Y Position"))
-      .AddParameter("expression", _("Right bound X Position"))
-      .AddParameter("expression", _("Bottom bound Y Position"))
-      .AddParameter("layer", _("Layer"), "", true)
+      .AddParameter("expression",
+                    _("Left bound X Position"))
+      .AddParameter("expression",
+                    _("Top bound Y Position"))
+      .AddParameter("expression",
+                    _("Right bound X Position"))
+      .AddParameter("expression",
+                    _("Bottom bound Y Position"))
+      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
      .SetDefaultValue("\"\"")
      .AddParameter("expression", _("Camera number (default : 0)"), "", true)
      .SetDefaultValue("0")
      .MarkAsAdvanced();

  extension
-      .AddAction("CentreCamera",
-                 _("Center the camera on an object"),
-                 _("Center the camera on the specified object."),
-                 _("Center camera on _PARAM1_ (layer: _PARAM3_)"),
-                 _("Layers and cameras"),
-                 "res/actions/camera24.png",
-                 "res/actions/camera.png")
+      .AddAction(
+          "CentreCamera",
+          _("Center the camera on an object"),
+          _("Center the camera on the specified object."),
+          _("Center camera on _PARAM1_ (layer: _PARAM3_)"),
+          "",
+          "res/actions/camera24.png",
+          "res/actions/camera.png")
      .AddCodeOnlyParameter("currentScene", "")
      .AddParameter("objectPtr", _("Object"))
      .AddParameter("yesorno",
@@ -396,7 +310,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                    "",
                    true)
      .SetDefaultValue("yes")
-      .AddParameter("layer", _("Layer"), "", true)
+      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
      .SetDefaultValue("\"\"")
      .AddParameter("expression", _("Camera number (default : 0)"), "", true)
      .SetDefaultValue("0")
@@ -411,7 +325,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                 "res/actions/layer24.png",
                 "res/actions/layer.png")
      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer"))
+      .AddParameter("layer", _("Layer (base layer if empty)"))
      .SetDefaultValue("\"\"")
      .MarkAsAdvanced();

@@ -424,7 +338,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                 "res/actions/layer24.png",
                 "res/actions/layer.png")
      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer"))
+      .AddParameter("layer", _("Layer (base layer if empty)"))
      .SetDefaultValue("\"\"")
      .MarkAsAdvanced();

@@ -437,65 +351,65 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                    "res/conditions/layer24.png",
                    "res/conditions/layer.png")
      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer"))
+      .AddParameter("layer", _("Layer (base layer if empty)"))
      .SetDefaultValue("\"\"")
      .MarkAsAdvanced();

  extension
      .AddAction(
          "SetLayerEffectParameter",
-          _("Effect property (number)"),
-          _("Change the value of a property of an effect.") + "\n" +
-              _("You can find the property names (and change the effect "
+          _("Effect parameter (number)"),
+          _("Change the value of a parameter of an effect.") + "\n" +
+              _("You can find the parameter names (and change the effect "
                "names) in the effects window."),
          _("Set _PARAM3_ to _PARAM4_ for effect _PARAM2_ of layer _PARAM1_"),
          _("Effects"),
-          "res/actions/effect24.png",
-          "res/actions/effect.png")
+          "res/conditions/camera24.png",
+          "res/conditions/camera.png")
      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer"), "", true)
+      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
      .SetDefaultValue("\"\"")
      .AddParameter("layerEffectName", _("Effect name"))
-      .AddParameter("layerEffectParameterName", _("Property name"))
+      .AddParameter("layerEffectParameterName", _("Parameter name"))
      .AddParameter("expression", _("New value"))
      .MarkAsAdvanced();

  extension
      .AddAction(
          "SetLayerEffectStringParameter",
-          _("Effect property (string)"),
-          _("Change the value (string) of a property of an effect.") + "\n" +
-              _("You can find the property names (and change the effect "
+          _("Effect parameter (string)"),
+          _("Change the value (string) of a parameter of an effect.") + "\n" +
+              _("You can find the parameter names (and change the effect "
                "names) in the effects window."),
          _("Set _PARAM3_ to _PARAM4_ for effect _PARAM2_ of layer _PARAM1_"),
          _("Effects"),
-          "res/actions/effect24.png",
-          "res/actions/effect.png")
+          "res/conditions/camera24.png",
+          "res/conditions/camera.png")
      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer"), "", true)
+      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
      .SetDefaultValue("\"\"")
      .AddParameter("layerEffectName", _("Effect name"))
-      .AddParameter("layerEffectParameterName", _("Property name"))
+      .AddParameter("layerEffectParameterName", _("Parameter name"))
      .AddParameter("string", _("New value"))
      .MarkAsAdvanced();

  extension
      .AddAction(
          "SetLayerEffectBooleanParameter",
-          _("Effect property (enable or disable)"),
-          _("Enable or disable a property of an effect.") + "\n" +
-              _("You can find the property names (and change the effect "
+          _("Effect parameter (enable or disable)"),
+          _("Enable or disable a parameter of an effect.") + "\n" +
+              _("You can find the parameter names (and change the effect "
                "names) in the effects window."),
          _("Enable _PARAM3_ for effect _PARAM2_ of layer _PARAM1_: _PARAM4_"),
          _("Effects"),
-          "res/actions/effect24.png",
-          "res/actions/effect.png")
+          "res/conditions/camera24.png",
+          "res/conditions/camera.png")
      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer"), "", true)
+      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
      .SetDefaultValue("\"\"")
      .AddParameter("layerEffectName", _("Effect name"))
-      .AddParameter("layerEffectParameterName", _("Property name"))
-      .AddParameter("yesorno", _("Enable this property"))
+      .AddParameter("layerEffectParameterName", _("Parameter name"))
+      .AddParameter("yesorno", _("Enable this parameter"))
      .MarkAsAdvanced();

  extension
@@ -503,11 +417,11 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                    _("Layer effect is enabled"),
                    _("The effect on a layer is enabled"),
                    _("Effect _PARAM2_ on layer _PARAM1_ is enabled"),
-                    _(""),
-                    "res/actions/effect24.png",
-                    "res/actions/effect.png")
+                    _("Effects"),
+                    "res/conditions/camera24.png",
+                    "res/conditions/camera.png")
      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer"), "", true)
+      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
      .SetDefaultValue("\"\"")
      .AddParameter("layerEffectName", _("Effect name"))
      .MarkAsAdvanced();
@@ -518,10 +432,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                 _("Enable an effect on a layer"),
                 _("Enable effect _PARAM2_ on layer _PARAM1_: _PARAM3_"),
                 _("Effects"),
-                 "res/actions/effect24.png",
-                 "res/actions/effect.png")
+                 "res/conditions/camera24.png",
+                 "res/conditions/camera.png")
      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer"), "", true)
+      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
      .SetDefaultValue("\"\"")
      .AddParameter("layerEffectName", _("Effect name"))
      .AddParameter("yesorno", _("Enable"), "", true)
@@ -537,25 +451,22 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
          "res/conditions/time24.png",
          "res/conditions/time.png")
      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer"), "", true)
+      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
      .SetDefaultValue("\"\"")
-      .UseStandardRelationalOperatorParameters(
-          "number",
-          gd::ParameterOptions::MakeNewOptions().SetDescription(
-              _("Time scale (1 by default)")))
+      .UseStandardRelationalOperatorParameters("number")
      .MarkAsAdvanced();

  extension
      .AddAction(
          "ChangeLayerTimeScale",
-          _("Layer time scale"),
+          _("Change layer time scale"),
          _("Change the time scale applied to the objects of the layer."),
          _("Set the time scale of layer _PARAM1_ to _PARAM2_"),
          "",
          "res/actions/time24.png",
          "res/actions/time.png")
      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer"), "", true)
+      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
      .SetDefaultValue("\"\"")
      .AddParameter("expression",
                    _("Scale (1: Default, 2: 2x faster, 0.5: 2x slower...)"));
@@ -570,15 +481,14 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                    "res/conditions/layer24.png",
                    "res/conditions/layer.png")
      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer"), "", true)
+      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
      .SetDefaultValue("\"\"")
-      .UseStandardRelationalOperatorParameters(
-          "number", gd::ParameterOptions::MakeNewOptions())
+      .UseStandardRelationalOperatorParameters("number")
      .MarkAsAdvanced();

  extension
      .AddAction("SetLayerDefaultZOrder",
-                 _("Layer default Z order"),
+                 _("Change layer default Z order"),
                 _("Change the default Z order set to objects when they are "
                   "created on a layer."),
                 _("Set the default Z order of objects created on _PARAM1_ to "
@@ -587,22 +497,22 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                 "res/actions/layer24.png",
                 "res/actions/layer.png")
      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer"), "", true)
+      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
      .SetDefaultValue("\"\"")
      .AddParameter("expression", _("New default Z order"));

  extension
      .AddAction(
          "SetLayerAmbientLightColor",
-          _("Ambient light color"),
+          _("Set the ambient light color"),
          _("Set the ambient light color of the lighting layer in format "
            "\"R;G;B\" string."),
          _("Set the ambient color of the lighting layer _PARAM1_ to _PARAM2_"),
-          _(""),
+          _("Lighting"),
          "res/actions/color24.png",
          "res/actions/color.png")
      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer"), "", true)
+      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
      .SetDefaultValue("\"Lighting\"")
      .AddParameter("color", _("Color"))
      .MarkAsAdvanced();
--- a/Core/GDCore/Extensions/Builtin/Capabilities/AnimatableExtension.cpp
+++ b/Core/GDCore/Extensions/Builtin/Capabilities/AnimatableExtension.cpp
@@ -1,165 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the GNU Lesser General Public
- * License.
- */
-#include "GDCore/Extensions/Builtin/AllBuiltinExtensions.h"
-#include "GDCore/Extensions/Metadata/MultipleInstructionMetadata.h"
-#include "GDCore/Project/Behavior.h"
-#include "GDCore/Project/BehaviorsSharedData.h"
-#include "GDCore/Project/Object.h"
-#include "GDCore/Tools/Localization.h"
-
-using namespace std;
-namespace gd {
-
-void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAnimatableExtension(
-    gd::PlatformExtension& extension) {
-  extension
-      .SetExtensionInformation("AnimatableCapability",
-                               _("Animatable capability"),
-                               _("Animate objects."),
-                               "Florian Rival",
-                               "Open source (MIT License)")
-      .SetExtensionHelpPath("/objects");
-  extension.AddInstructionOrExpressionGroupMetadata(_("Animatable capability"))
-      .SetIcon("res/actions/animation24.png");
-  extension.AddInstructionOrExpressionGroupMetadata(_("Animations and images"))
-      .SetIcon("res/actions/animation24.png");
-
-  gd::BehaviorMetadata& aut = extension.AddBehavior(
-      "AnimatableBehavior",
-      _("Animatable capability"),
-      "Animation",
-      _("Animate objects."),
-      "",
-      "res/actions/animation24.png",
-      "AnimatableBehavior",
-      std::make_shared<gd::Behavior>(),
-      std::make_shared<gd::BehaviorsSharedData>())
-    .SetHidden();
-
-  aut.AddExpressionAndConditionAndAction(
-         "number",
-         "Index",
-         _("Animation (by number)"),
-         _("the animation played by the object using the animation number (from "
-           "the animations list)"),
-         _("the number of the animation"),
-         _("Animations and images"),
-         "res/actions/animation24.png")
-      .AddParameter("object", _("Object"))
-      .AddParameter("behavior", _("Behavior"), "AnimatableBehavior")
-      .UseStandardParameters(
-          "number", gd::ParameterOptions::MakeNewOptions().SetDescription(
-                        _("Animation index")))
-      .MarkAsSimple();
-  aut.GetAllExpressions()["Index"].SetGroup("");
-
-  aut.AddExpressionAndConditionAndAction(
-         "string",
-         "Name",
-         _("Animation (by name)"),
-         _("the animation played by the object using the name of the "
-           "animation"),
-         _("the animation"),
-         _("Animations and images"),
-         "res/actions/animation24.png")
-      .AddParameter("object", _("Object"))
-      .AddParameter("behavior", _("Behavior"), "AnimatableBehavior")
-      .UseStandardParameters(
-          "objectAnimationName", gd::ParameterOptions::MakeNewOptions().SetDescription(
-                        _("Animation name")))
-      .MarkAsSimple();
-  aut.GetAllStrExpressions()["Name"].SetGroup("");
-
-  aut.AddScopedAction("PauseAnimation",
-                _("Pause the animation"),
-                _("Pause the animation of the object."),
-                _("Pause the animation of _PARAM0_"),
-                _("Animations and images"),
-                "res/actions/animation24.png",
-                "res/actions/animation.png")
-      .AddParameter("object", _("Object"))
-      .AddParameter("behavior", _("Behavior"), "AnimatableBehavior")
-      .MarkAsSimple();
-
-  aut.AddScopedAction("PlayAnimation",
-                _("Resume the animation"),
-                _("Resume the animation of the object."),
-                _("Resume the animation of _PARAM0_"),
-                _("Animations and images"),
-                "res/actions/animation24.png",
-                "res/actions/animation.png")
-      .AddParameter("object", _("Object"))
-      .AddParameter("behavior", _("Behavior"), "AnimatableBehavior")
-      .MarkAsSimple();
-
-  aut.AddExpressionAndConditionAndAction(
-         "number",
-         "SpeedScale",
-         _("Animation speed scale"),
-         _("the animation speed scale (1 = the default speed, >1 = faster and "
-           "<1 = slower)"),
-         _("the animation speed scale"),
-         _("Animations and images"),
-         "res/actions/animation24.png")
-      .AddParameter("object", _("Object"))
-      .AddParameter("behavior", _("Behavior"), "AnimatableBehavior")
-      .UseStandardParameters(
-          "number", gd::ParameterOptions::MakeNewOptions().SetDescription(
-                        _("Speed scale")))
-      .MarkAsSimple();
-  aut.GetAllExpressions()["SpeedScale"].SetGroup("");
-
-  aut.AddScopedCondition("IsAnimationPaused",
-                   _("Animation paused"),
-                   _("Check if the animation of an object is paused."),
-                   _("The animation of _PARAM0_ is paused"),
-                   _("Animations and images"),
-                   "res/conditions/animation24.png",
-                   "res/conditions/animation.png")
-      .AddParameter("object", _("Object"))
-      .AddParameter("behavior", _("Behavior"), "AnimatableBehavior")
-      .MarkAsSimple();
-
-  aut.AddScopedCondition("HasAnimationEnded",
-                   _("Animation finished"),
-                   _("Check if the animation being played by the Sprite object "
-                     "is finished."),
-                   _("The animation of _PARAM0_ is finished"),
-                   _("Animations and images"),
-                   "res/conditions/animation24.png",
-                   "res/conditions/animation.png")
-      .AddParameter("object", _("Object"))
-      .AddParameter("behavior", _("Behavior"), "AnimatableBehavior")
-      .MarkAsSimple();
-
-  aut.AddExpressionAndConditionAndAction(
-         "number",
-         "ElapsedTime",
-         _("Animation elapsed time"),
-         _("the elapsed time from the beginning of the animation (in seconds)"),
-         _("the animation elapsed time"),
-         _("Animations and images"),
-         "res/actions/animation24.png")
-      .AddParameter("object", _("Object"))
-      .AddParameter("behavior", _("Behavior"), "AnimatableBehavior")
-      .UseStandardParameters(
-          "number", gd::ParameterOptions::MakeNewOptions().SetDescription(
-                        _("Elapsed time (in seconds)")))
-      .MarkAsAdvanced();
-  aut.GetAllExpressions()["ElapsedTime"].SetGroup("");
-
-  aut.AddExpression(
-         "Duration",
-         _("Animation duration"),
-         _("Return the current animation duration (in seconds)."),
-         _("Animations and images"),
-         "res/actions/animation24.png")
-      .AddParameter("object", _("Object"))
-      .AddParameter("behavior", _("Behavior"), "AnimatableBehavior");
-}
-
-}  // namespace gd
--- a/Core/GDCore/Extensions/Builtin/Capabilities/EffectExtension.cpp
+++ b/Core/GDCore/Extensions/Builtin/Capabilities/EffectExtension.cpp
@@ -1,116 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the GNU Lesser General Public
- * License.
- */
-#include "GDCore/Extensions/Builtin/AllBuiltinExtensions.h"
-#include "GDCore/Extensions/Metadata/MultipleInstructionMetadata.h"
-#include "GDCore/Project/Behavior.h"
-#include "GDCore/Project/BehaviorsSharedData.h"
-#include "GDCore/Project/Object.h"
-#include "GDCore/Tools/Localization.h"
-
-using namespace std;
-namespace gd {
-
-void GD_CORE_API BuiltinExtensionsImplementer::ImplementsEffectExtension(
-    gd::PlatformExtension& extension) {
-  extension
-      .SetExtensionInformation("EffectCapability",
-                               _("Effect capability"),
-                               _("Apply visual effects to objects."),
-                               "Florian Rival",
-                               "Open source (MIT License)")
-      .SetExtensionHelpPath("/objects");
-  extension.AddInstructionOrExpressionGroupMetadata(_("Effects"))
-      .SetIcon("res/actions/effect24.png");
-
-  gd::BehaviorMetadata& aut = extension.AddBehavior(
-      "EffectBehavior",
-      _("Effect capability"),
-      "Effect",
-      _("Apply visual effects to objects."),
-      "",
-      "res/actions/effect24.png",
-      "EffectBehavior",
-      std::make_shared<gd::Behavior>(),
-      std::make_shared<gd::BehaviorsSharedData>())
-    .SetHidden();
-
-  aut.AddScopedAction("EnableEffect",
-                _("Enable an object effect"),
-                _("Enable an effect on the object"),
-                _("Enable effect _PARAM2_ on _PARAM0_: _PARAM3_"),
-                _("Effects"),
-                "res/actions/effect24.png",
-                "res/actions/effect.png")
-      .AddParameter("object", _("Object"))
-      .AddParameter("behavior", _("Behavior"), "EffectBehavior")
-      .AddParameter("objectEffectName", _("Effect name"))
-      .AddParameter("yesorno", _("Enable?"))
-      .MarkAsSimple();
-
-  aut.AddScopedAction("SetEffectDoubleParameter",
-                _("Effect property (number)"),
-                _("Change the value of a property of an effect.") + "\n" +
-                    _("You can find the property names (and change the effect "
-                      "names) in the effects window."),
-                _("Set _PARAM3_ to _PARAM4_ for effect _PARAM2_ of _PARAM0_"),
-                _("Effects"),
-                "res/actions/effect24.png",
-                "res/actions/effect.png")
-      .AddParameter("object", _("Object"))
-      .AddParameter("behavior", _("Behavior"), "EffectBehavior")
-      .AddParameter("objectEffectName", _("Effect name"))
-      .AddParameter("objectEffectParameterName", _("Property name"))
-      .AddParameter("expression", _("New value"))
-      .MarkAsSimple();
-
-  aut.AddScopedAction("SetEffectStringParameter",
-                _("Effect property (string)"),
-                _("Change the value (string) of a property of an effect.") +
-                    "\n" +
-                    _("You can find the property names (and change the effect "
-                      "names) in the effects window."),
-                _("Set _PARAM3_ to _PARAM4_ for effect _PARAM2_ of _PARAM0_"),
-                _("Effects"),
-                "res/actions/effect24.png",
-                "res/actions/effect.png")
-      .AddParameter("object", _("Object"))
-      .AddParameter("behavior", _("Behavior"), "EffectBehavior")
-      .AddParameter("objectEffectName", _("Effect name"))
-      .AddParameter("objectEffectParameterName", _("Property name"))
-      .AddParameter("string", _("New value"))
-      .MarkAsSimple();
-
-  aut.AddScopedAction("SetEffectBooleanParameter",
-                _("Effect property (enable or disable)"),
-                _("Enable or disable a property of an effect.") + "\n" +
-                    _("You can find the property names (and change the effect "
-                      "names) in the effects window."),
-                _("Enable _PARAM3_ for effect _PARAM2_ of _PARAM0_: _PARAM4_"),
-                _("Effects"),
-                "res/actions/effect24.png",
-                "res/actions/effect.png")
-      .AddParameter("object", _("Object"))
-      .AddParameter("behavior", _("Behavior"), "EffectBehavior")
-      .AddParameter("objectEffectName", _("Effect name"))
-      .AddParameter("objectEffectParameterName", _("Property name"))
-      .AddParameter("yesorno", _("Enable this property"))
-      .MarkAsSimple();
-
-  aut.AddScopedCondition("IsEffectEnabled",
-                   _("Effect is enabled"),
-                   _("Check if the effect on an object is enabled."),
-                   _("Effect _PARAM2_ of _PARAM0_ is enabled"),
-                   _("Effects"),
-                   "res/actions/effect24.png",
-                   "res/actions/effect.png")
-      .AddParameter("object", _("Object"))
-      .AddParameter("behavior", _("Behavior"), "EffectBehavior")
-      .AddParameter("objectEffectName", _("Effect name"))
-      .MarkAsSimple();
-}
-
-}  // namespace gd
--- a/Core/GDCore/Extensions/Builtin/Capabilities/FlippableExtension.cpp
+++ b/Core/GDCore/Extensions/Builtin/Capabilities/FlippableExtension.cpp
@@ -1,86 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the GNU Lesser General Public
- * License.
- */
-#include "GDCore/Extensions/Builtin/AllBuiltinExtensions.h"
-#include "GDCore/Extensions/Metadata/MultipleInstructionMetadata.h"
-#include "GDCore/Project/Behavior.h"
-#include "GDCore/Project/BehaviorsSharedData.h"
-#include "GDCore/Project/Object.h"
-#include "GDCore/Tools/Localization.h"
-
-using namespace std;
-namespace gd {
-
-void GD_CORE_API BuiltinExtensionsImplementer::ImplementsFlippableExtension(
-    gd::PlatformExtension& extension) {
-  extension
-      .SetExtensionInformation("FlippableCapability",
-                               _("Flippable capability"),
-                               _("Flip objects."),
-                               "Florian Rival",
-                               "Open source (MIT License)")
-      .SetExtensionHelpPath("/objects");
-  extension.AddInstructionOrExpressionGroupMetadata(_("Effects"))
-      .SetIcon("res/actions/effect24.png");
-
-  gd::BehaviorMetadata& aut = extension.AddBehavior(
-      "FlippableBehavior",
-      _("Flippable capability"),
-      "Flippable",
-      _("Flip objects."),
-      "",
-      "res/actions/flipX24.png",
-      "FlippableBehavior",
-      std::make_shared<gd::Behavior>(),
-      std::make_shared<gd::BehaviorsSharedData>())
-    .SetHidden();
-
-  aut.AddScopedAction("FlipX",
-                _("Flip the object horizontally"),
-                _("Flip the object horizontally"),
-                _("Flip horizontally _PARAM0_: _PARAM2_"),
-                _("Effects"),
-                "res/actions/flipX24.png",
-                "res/actions/flipX.png")
-      .AddParameter("object", _("Object"))
-      .AddParameter("behavior", _("Behavior"), "FlippableBehavior")
-      .AddParameter("yesorno", _("Activate flipping"))
-      .MarkAsSimple();
-
-  aut.AddScopedAction("FlipY",
-                _("Flip the object vertically"),
-                _("Flip the object vertically"),
-                _("Flip vertically _PARAM0_: _PARAM2_"),
-                _("Effects"),
-                "res/actions/flipY24.png",
-                "res/actions/flipY.png")
-      .AddParameter("object", _("Object"))
-      .AddParameter("behavior", _("Behavior"), "FlippableBehavior")
-      .AddParameter("yesorno", _("Activate flipping"))
-      .MarkAsSimple();
-
-  aut.AddScopedCondition("FlippedX",
-                   _("Horizontally flipped"),
-                   _("Check if the object is horizontally flipped"),
-                   _("_PARAM0_ is horizontally flipped"),
-                   _("Effects"),
-                   "res/actions/flipX24.png",
-                   "res/actions/flipX.png")
-      .AddParameter("object", _("Object"))
-      .AddParameter("behavior", _("Behavior"), "FlippableBehavior");
-
-  aut.AddScopedCondition("FlippedY",
-                   _("Vertically flipped"),
-                   _("Check if the object is vertically flipped"),
-                   _("_PARAM0_ is vertically flipped"),
-                   _("Effects"),
-                   "res/actions/flipY24.png",
-                   "res/actions/flipY.png")
-      .AddParameter("object", _("Object"))
-      .AddParameter("behavior", _("Behavior"), "FlippableBehavior");
-}
-
-}  // namespace gd
--- a/Core/GDCore/Extensions/Builtin/Capabilities/OpacityExtension.cpp
+++ b/Core/GDCore/Extensions/Builtin/Capabilities/OpacityExtension.cpp
@@ -1,62 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the GNU Lesser General Public
- * License.
- */
-#include "GDCore/Extensions/Builtin/AllBuiltinExtensions.h"
-#include "GDCore/Extensions/Metadata/MultipleInstructionMetadata.h"
-#include "GDCore/Project/Behavior.h"
-#include "GDCore/Project/BehaviorsSharedData.h"
-#include "GDCore/Project/Object.h"
-#include "GDCore/Tools/Localization.h"
-
-using namespace std;
-namespace gd {
-
-void GD_CORE_API BuiltinExtensionsImplementer::ImplementsOpacityExtension(
-    gd::PlatformExtension& extension) {
-  extension
-      .SetExtensionInformation("OpacityCapability",
-                               _("Opacity capability"),
-                               _("Change the object opacity."),
-                               "Florian Rival",
-                               "Open source (MIT License)")
-      .SetExtensionHelpPath("/objects");
-  extension.AddInstructionOrExpressionGroupMetadata(_("Opacity capability"))
-      .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();
-
-  aut.AddExpressionAndConditionAndAction(
-         "number",
-         "Value",
-         _("Opacity"),
-         _("the opacity of an object, between 0 (fully transparent) to 255 "
-           "(opaque)"),
-         _("the opacity"),
-         _("Visibility"),
-         "res/actions/opacity24.png")
-      .AddParameter("object", _("Object"))
-      .AddParameter("behavior", _("Behavior"), "OpacityBehavior")
-      .UseStandardParameters(
-          "number", gd::ParameterOptions::MakeNewOptions().SetDescription(
-                        _("Opacity (0-255)")))
-      .SetFunctionName("setOpacity")
-      .SetGetter("getOpacity");
-  aut.GetAllExpressions()["Value"].SetGroup("");
-}
-
-}  // namespace gd
--- a/Core/GDCore/Extensions/Builtin/Capabilities/ResizableExtension.cpp
+++ b/Core/GDCore/Extensions/Builtin/Capabilities/ResizableExtension.cpp
@@ -1,112 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the GNU Lesser General Public
- * License.
- */
-#include "GDCore/Extensions/Builtin/AllBuiltinExtensions.h"
-#include "GDCore/Project/Behavior.h"
-#include "GDCore/Project/BehaviorsSharedData.h"
-#include "GDCore/Project/Object.h"
-#include "GDCore/Tools/Localization.h"
-
-using namespace std;
-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)")
-      .SetExtensionHelpPath("/objects");
-  extension.AddInstructionOrExpressionGroupMetadata(_("Size")).SetIcon(
-      "res/actions/scale24_black.png");
-
-  gd::BehaviorMetadata &aut =
-      extension
-          .AddBehavior("ResizableBehavior",
-                       _("Resizable capability"),
-                       "Resizable",
-                       _("Change the object dimensions."),
-                       "",
-                       "res/actions/scale24_black.png",
-                       "ResizableBehavior",
-                       std::make_shared<gd::Behavior>(),
-                       std::make_shared<gd::BehaviorsSharedData>())
-          .SetHidden();
-
-  aut.AddScopedAction("SetWidth",
-                      _("Width"),
-                      _("Change the width of the object."),
-                      _("the width"),
-                      _("Size"),
-                      "res/actions/scaleWidth24_black.png",
-                      "res/actions/scaleWidth_black.png")
-      .AddParameter("object", _("Object"))
-      .AddParameter("behavior", _("Behavior"), "ResizableBehavior")
-      .UseStandardOperatorParameters(
-          "number",
-          ParameterOptions::MakeNewOptions().SetDescription(_("Width")))
-      .MarkAsAdvanced();
-
-  aut.AddScopedCondition("Width",
-                         _("Width"),
-                         _("Compare the width of the object."),
-                         _("the width"),
-                         _("Size"),
-                         "res/conditions/scaleWidth24_black.png",
-                         "res/conditions/scaleWidth_black.png")
-      .AddParameter("object", _("Object"))
-      .AddParameter("behavior", _("Behavior"), "ResizableBehavior")
-      .UseStandardRelationalOperatorParameters(
-          "number",
-          ParameterOptions::MakeNewOptions().SetDescription(_("Width")))
-      .MarkAsAdvanced();
-
-  aut.AddScopedAction("SetHeight",
-                      _("Height"),
-                      _("Change the height of the object."),
-                      _("the height"),
-                      _("Size"),
-                      "res/actions/scaleHeight24_black.png",
-                      "res/actions/scaleHeight_black.png")
-      .AddParameter("object", _("Object"))
-      .AddParameter("behavior", _("Behavior"), "ResizableBehavior")
-      .UseStandardOperatorParameters(
-          "number",
-          ParameterOptions::MakeNewOptions().SetDescription(_("Height")))
-      .MarkAsAdvanced();
-
-  aut.AddScopedCondition("Height",
-                         _("Height"),
-                         _("Compare the height of the object."),
-                         _("the height"),
-                         _("Size"),
-                         "res/conditions/scaleHeight24_black.png",
-                         "res/conditions/scaleHeight_black.png")
-      .AddParameter("object", _("Object"))
-      .AddParameter("behavior", _("Behavior"), "ResizableBehavior")
-      .UseStandardRelationalOperatorParameters(
-          "number",
-          ParameterOptions::MakeNewOptions().SetDescription(_("Height")))
-      .MarkAsAdvanced();
-
-  aut.AddScopedAction(
-         "SetSize",
-         _("Size"),
-         _("Change the size of an object."),
-         _("Change the size of _PARAM0_: set to _PARAM2_ x _PARAM3_"),
-         _("Size"),
-         "res/actions/scale24_black.png",
-         "res/actions/scale_black.png")
-      .AddParameter("object", _("Object"))
-      .AddParameter("behavior", _("Behavior"), "ResizableBehavior")
-      .AddParameter("expression", _("Width"))
-      .AddParameter("expression", _("Height"))
-      .MarkAsAdvanced();
-}
-
-}  // namespace gd
--- a/Core/GDCore/Extensions/Builtin/Capabilities/ScalableExtension.cpp
+++ b/Core/GDCore/Extensions/Builtin/Capabilities/ScalableExtension.cpp
@@ -1,95 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the GNU Lesser General Public
- * License.
- */
-#include "GDCore/Extensions/Builtin/AllBuiltinExtensions.h"
-#include "GDCore/Extensions/Metadata/MultipleInstructionMetadata.h"
-#include "GDCore/Project/Behavior.h"
-#include "GDCore/Project/BehaviorsSharedData.h"
-#include "GDCore/Project/Object.h"
-#include "GDCore/Tools/Localization.h"
-
-using namespace std;
-namespace gd {
-
-void GD_CORE_API BuiltinExtensionsImplementer::ImplementsScalableExtension(
-    gd::PlatformExtension& extension) {
-  extension
-      .SetExtensionInformation("ScalableCapability",
-                               _("Scalable capability"),
-                               _("Change the object scale."),
-                               "Florian Rival",
-                               "Open source (MIT License)")
-      .SetExtensionHelpPath("/objects");
-  extension.AddInstructionOrExpressionGroupMetadata(_("Scalable capability"))
-      .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();
-
-  aut.AddExpressionAndConditionAndAction(
-         "number",
-         "Value",
-         _("Scale"),
-         _("the scale of the object (default scale is 1)"),
-         _("the scale"),
-         _("Size"),
-         "res/actions/scale24_black.png")
-      .AddParameter("object", _("Object"))
-      .AddParameter("behavior", _("Behavior"), "ScalableBehavior")
-      .UseStandardParameters(
-          "number",
-          gd::ParameterOptions::MakeNewOptions().SetDescription(
-              _("Scale (1 by default)")))
-      .MarkAsAdvanced();
-  aut.GetAllExpressions()["Value"].SetGroup("");
-
-  aut.AddExpressionAndConditionAndAction(
-         "number",
-         "X",
-         _("Scale on X axis"),
-         _("the scale on X axis of the object (default scale is 1)"),
-         _("the scale on X axis"),
-         _("Size"),
-         "res/actions/scaleWidth24_black.png")
-      .AddParameter("object", _("Object"))
-      .AddParameter("behavior", _("Behavior"), "ScalableBehavior")
-      .UseStandardParameters(
-          "number",
-          gd::ParameterOptions::MakeNewOptions().SetDescription(
-              _("Scale (1 by default)")))
-      .MarkAsAdvanced();
-  aut.GetAllExpressions()["X"].SetGroup("");
-
-  aut.AddExpressionAndConditionAndAction(
-         "number",
-         "Y",
-         _("Scale on Y axis"),
-         _("the scale on Y axis of the object (default scale is 1)"),
-         _("the scale on Y axis"),
-         _("Size"),
-         "res/actions/scaleHeight24_black.png")
-      .AddParameter("object", _("Object"))
-      .AddParameter("behavior", _("Behavior"), "ScalableBehavior")
-      .UseStandardParameters(
-          "number",
-          gd::ParameterOptions::MakeNewOptions().SetDescription(
-              _("Scale (1 by default)")))
-      .MarkAsAdvanced();
-  aut.GetAllExpressions()["Y"].SetGroup("");
-}
-
-}  // namespace gd
--- a/Core/GDCore/Extensions/Builtin/Capabilities/TextContainerExtension.cpp
+++ b/Core/GDCore/Extensions/Builtin/Capabilities/TextContainerExtension.cpp
@@ -1,58 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the GNU Lesser General Public
- * License.
- */
-#include "GDCore/Extensions/Builtin/AllBuiltinExtensions.h"
-#include "GDCore/Extensions/Metadata/MultipleInstructionMetadata.h"
-#include "GDCore/Project/Behavior.h"
-#include "GDCore/Project/BehaviorsSharedData.h"
-#include "GDCore/Project/Object.h"
-#include "GDCore/Tools/Localization.h"
-
-using namespace std;
-namespace gd {
-
-void GD_CORE_API BuiltinExtensionsImplementer::ImplementsTextContainerExtension(
-    gd::PlatformExtension& extension) {
-  extension
-      .SetExtensionInformation("TextContainerCapability",
-                               _("Text capability"),
-                               _("Animate objects."),
-                               "Florian Rival",
-                               "Open source (MIT License)")
-      .SetExtensionHelpPath("/objects");
-  extension.AddInstructionOrExpressionGroupMetadata(_("Text capability"))
-      .SetIcon("res/conditions/text24_black.png");
-
-  gd::BehaviorMetadata& aut = extension.AddBehavior(
-      "TextContainerBehavior",
-      _("Text capability"),
-      "Text",
-      _("Access objects text."),
-      "",
-      "res/conditions/text24_black.png",
-      "TextContainerBehavior",
-      std::make_shared<gd::Behavior>(),
-      std::make_shared<gd::BehaviorsSharedData>())
-    .SetHidden();
-
-  aut.AddExpressionAndConditionAndAction(
-         "string",
-         "Value",
-         _("Text"),
-         _("the text"),
-         _("the text"),
-         "",
-         "res/conditions/text24_black.png")
-      .AddParameter("object", _("Object"))
-      .AddParameter("behavior", _("Behavior"), "TextContainerBehavior")
-      .UseStandardParameters(
-          "string", gd::ParameterOptions::MakeNewOptions().SetDescription(
-                        _("Text")))
-      .MarkAsSimple();
-  aut.GetAllStrExpressions()["Value"].SetGroup("");
-}
-
-}  // namespace gd
--- a/Core/GDCore/Extensions/Builtin/CommonConversionsExtension.cpp
+++ b/Core/GDCore/Extensions/Builtin/CommonConversionsExtension.cpp
@@ -21,14 +21,14 @@ BuiltinExtensionsImplementer::ImplementsCommonConversionsExtension(
          "Open source (MIT License)")
      .SetExtensionHelpPath("/all-features/common-conversions");
  extension.AddInstructionOrExpressionGroupMetadata(_("Conversion"))
-      .SetIcon("res/conditions/toujours24_black.png");
+      .SetIcon("res/conditions/toujours24.png");

  extension
      .AddExpression("ToNumber",
                     _("Text > Number"),
                     _("Convert the text to a number"),
                     "",
-                     "res/conditions/toujours24_black.png")
+                     "res/conditions/toujours24.png")
      .AddParameter("string", _("Text to convert to a number"));

  extension
@@ -36,7 +36,7 @@ BuiltinExtensionsImplementer::ImplementsCommonConversionsExtension(
                        _("Number > Text"),
                        _("Convert the result of the expression to text"),
                        "",
-                        "res/conditions/toujours24_black.png")
+                        "res/conditions/toujours24.png")
      .AddParameter("expression", _("Expression to be converted to text"));

  extension
@@ -45,7 +45,7 @@ BuiltinExtensionsImplementer::ImplementsCommonConversionsExtension(
                        _("Convert the result of the expression to text, "
                          "without using the scientific notation"),
                        "",
-                        "res/conditions/toujours24_black.png")
+                        "res/conditions/toujours24.png")
      .AddParameter("expression", _("Expression to be converted to text"));

  extension
@@ -54,7 +54,7 @@ BuiltinExtensionsImplementer::ImplementsCommonConversionsExtension(
          _("Degrees > Radians"),
          _("Converts the angle, expressed in degrees, into radians"),
          "",
-          "res/conditions/toujours24_black.png")
+          "res/conditions/toujours24.png")
      .AddParameter("expression", _("Angle, in degrees"));

  extension
@@ -63,7 +63,7 @@ BuiltinExtensionsImplementer::ImplementsCommonConversionsExtension(
          _("Radians > Degrees"),
          _("Converts the angle, expressed in radians, into degrees"),
          "",
-          "res/conditions/toujours24_black.png")
+          "res/conditions/toujours24.png")
      .AddParameter("expression", _("Angle, in radians"));

  extension
@@ -71,7 +71,7 @@ BuiltinExtensionsImplementer::ImplementsCommonConversionsExtension(
                        _("Convert scene variable to JSON"),
                        _("Convert a scene variable to JSON"),
                        _("JSON"),
-                        "res/conditions/toujours24_black.png")
+                        "res/conditions/toujours24.png")
      .AddParameter("scenevar", _("Scene variable to be stringified"));

  extension
@@ -79,7 +79,7 @@ BuiltinExtensionsImplementer::ImplementsCommonConversionsExtension(
                        _("Convert global variable to JSON"),
                        _("Convert a global variable to JSON"),
                        _("JSON"),
-                        "res/conditions/toujours24_black.png")
+                        "res/conditions/toujours24.png")
      .AddParameter("globalvar", _("The global variable to be stringified"));

  extension
@@ -87,7 +87,7 @@ BuiltinExtensionsImplementer::ImplementsCommonConversionsExtension(
                        _("Convert object variable to JSON"),
                        _("Convert an object variable to JSON"),
                        _("JSON"),
-                        "res/conditions/toujours24_black.png")
+                        "res/conditions/toujours24.png")
      .AddParameter("objectPtr", _("The object with the variable"))
      .AddParameter("objectvar", _("The object variable to be stringified"));

@@ -96,7 +96,7 @@ BuiltinExtensionsImplementer::ImplementsCommonConversionsExtension(
          "JSONToVariableStructure",
          _("Convert JSON to a scene variable"),
          _("Parse a JSON object and store it into a scene variable"),
-          _("Convert JSON string _PARAM0_ and store it into variable _PARAM1_"),
+          _("Parse JSON string _PARAM0_ and store it into variable _PARAM1_"),
          "",
          "res/actions/net24.png",
          "res/actions/net.png")
@@ -108,7 +108,7 @@ BuiltinExtensionsImplementer::ImplementsCommonConversionsExtension(
      .AddAction("JSONToGlobalVariableStructure",
                 _("Convert JSON to global variable"),
                 _("Parse a JSON object and store it into a global variable"),
-                 _("Convert JSON string _PARAM0_ and store it into global "
+                 _("Parse JSON string _PARAM0_ and store it into global "
                   "variable _PARAM1_"),
                 "",
                 "res/actions/net24.png",
--- a/Core/GDCore/Extensions/Builtin/CommonInstructionsExtension.cpp
+++ b/Core/GDCore/Extensions/Builtin/CommonInstructionsExtension.cpp
@@ -33,10 +33,8 @@ BuiltinExtensionsImplementer::ImplementsCommonInstructionsExtension(
      .SetExtensionHelpPath("/all-features/advanced-conditions");
  extension
      .AddInstructionOrExpressionGroupMetadata(_("Events and control flow"))
-      .SetIcon("res/conditions/toujours24_black.png");
+      .SetIcon("res/conditions/toujours24.png");

-  // This condition is deprecated as this does not bring anything new
-  // and can be confusing or misleading for beginners.
  extension
      .AddCondition("Always",
                    _("Always"),
@@ -44,12 +42,11 @@ BuiltinExtensionsImplementer::ImplementsCommonInstructionsExtension(
                      "the condition is inverted)."),
                    _("Always"),
                    "",
-                    "res/conditions/toujours24_black.png",
-                    "res/conditions/toujours_black.png")
+                    "res/conditions/toujours24.png",
+                    "res/conditions/toujours.png")
      .SetHelpPath("/all-features/advanced-conditions")
      .AddCodeOnlyParameter("conditionInverted", "")
-      .MarkAsAdvanced()
-      .SetHidden();
+      .MarkAsAdvanced();

  // Compatibility with GD <= 5.0.127
  extension
@@ -64,8 +61,8 @@ BuiltinExtensionsImplementer::ImplementsCommonInstructionsExtension(
                    _("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")
+                    "res/conditions/or24.png",
+                    "res/conditions/or.png")
      .SetCanHaveSubInstructions()
      .MarkAsAdvanced();

@@ -75,8 +72,8 @@ BuiltinExtensionsImplementer::ImplementsCommonInstructionsExtension(
                    _("Check if all sub conditions are true"),
                    _("If all of these conditions are true:"),
                    "",
-                    "res/conditions/and24_black.png",
-                    "res/conditions/and_black.png")
+                    "res/conditions/and24.png",
+                    "res/conditions/and.png")
      .SetCanHaveSubInstructions()
      .MarkAsAdvanced();

@@ -87,8 +84,8 @@ BuiltinExtensionsImplementer::ImplementsCommonInstructionsExtension(
          _("Return the contrary of the result of the sub conditions"),
          _("Invert the logical result of these conditions:"),
          "",
-          "res/conditions/not24_black.png",
-          "res/conditions/not_black.png")
+          "res/conditions/not24.png",
+          "res/conditions/not.png")
      .SetCanHaveSubInstructions()
      .MarkAsAdvanced();

@@ -107,8 +104,8 @@ BuiltinExtensionsImplementer::ImplementsCommonInstructionsExtension(
                    _("Compare the two numbers."),
                    _("_PARAM0_ _PARAM1_ _PARAM2_"),
                    "",
-                    "res/conditions/egal24_black.png",
-                    "res/conditions/egal_black.png")
+                    "res/conditions/egal24.png",
+                    "res/conditions/egal.png")
      .SetHelpPath("/all-features/advanced-conditions")
      .AddParameter("expression", _("First expression"))
      .AddParameter("relationalOperator", _("Sign of the test"), "number")
@@ -117,9 +114,8 @@ BuiltinExtensionsImplementer::ImplementsCommonInstructionsExtension(

  // Compatibility with GD <= 5.0.127
  extension
-      .AddDuplicatedCondition("Egal",
-                              "BuiltinCommonInstructions::CompareNumbers",
-                              {.unscoped = true})
+      .AddDuplicatedCondition(
+          "Egal", "BuiltinCommonInstructions::CompareNumbers", {.unscoped = true})
      .SetHidden();
  // end of compatibility code

@@ -129,8 +125,8 @@ BuiltinExtensionsImplementer::ImplementsCommonInstructionsExtension(
                    _("Compare the two strings."),
                    _("_PARAM0_ _PARAM1_ _PARAM2_"),
                    "",
-                    "res/conditions/egal24_black.png",
-                    "res/conditions/egal_black.png")
+                    "res/conditions/egal24.png",
+                    "res/conditions/egal.png")
      .SetHelpPath("/all-features/advanced-conditions")
      .AddParameter("string", _("First string expression"))
      .AddParameter("relationalOperator", _("Sign of the test"), "string")
@@ -139,9 +135,8 @@ BuiltinExtensionsImplementer::ImplementsCommonInstructionsExtension(

  // Compatibility with GD <= 5.0.127
  extension
-      .AddDuplicatedCondition("StrEqual",
-                              "BuiltinCommonInstructions::CompareStrings",
-                              {.unscoped = true})
+      .AddDuplicatedCondition(
+          "StrEqual", "BuiltinCommonInstructions::CompareStrings", {.unscoped = true})
      .SetHidden();
  // end of compatibility code

--- a/Core/GDCore/Extensions/Builtin/ExternalLayoutsExtension.cpp
+++ b/Core/GDCore/Extensions/Builtin/ExternalLayoutsExtension.cpp
@@ -38,8 +38,6 @@ BuiltinExtensionsImplementer::ImplementsExternalLayoutsExtension(
      .SetDefaultValue("0")
      .AddParameter("expression", _("Y position of the origin"), "", true)
      .SetDefaultValue("0")
-      .AddParameter("expression", _("Z position of the origin"), "", true)
-      .SetDefaultValue("0")
      .MarkAsAdvanced();
 }

--- a/Core/GDCore/Extensions/Builtin/FileExtension.cpp
+++ b/Core/GDCore/Extensions/Builtin/FileExtension.cpp
@@ -21,7 +21,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsFileExtension(
          "Florian Rival",
          "Open source (MIT License)")
      .SetExtensionHelpPath("/all-features/storage")
-      .SetCategory("Advanced");
+      .SetCategory("Device");
  extension.AddInstructionOrExpressionGroupMetadata(_("Storage"))
      .SetIcon("res/conditions/fichier24.png");

@@ -69,12 +69,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsFileExtension(
  extension
      .AddAction(
          "EcrireFichierExp",
-          _("Save a value"),
-          _("Save the result of the expression in the stored data, in the "
+          _("Write a value"),
+          _("Write the result of the expression in the stored data, in the "
            "specified element.\nSpecify the structure leading to the "
            "element using / (example : Root/Level/Current)\nSpaces are "
            "forbidden in element names."),
-          _("Save _PARAM2_ in _PARAM1_ of storage _PARAM0_"),
+          _("Write _PARAM2_ in _PARAM1_ of storage _PARAM0_"),
          "",
          "res/actions/fichier24.png",
          "res/actions/fichier.png")
@@ -85,12 +85,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsFileExtension(
  extension
      .AddAction(
          "EcrireFichierTxt",
-          _("Save a text"),
-          _("Save the text in the specified storage, in the specified "
+          _("Write a text"),
+          _("Write the text in the specified storage, in the specified "
            "element.\nSpecify "
            "the structure leading to the element using / (example : "
            "Root/Level/Current)\nSpaces are forbidden in element names."),
-          _("Save _PARAM2_ in _PARAM1_ of storage _PARAM0_"),
+          _("Write _PARAM2_ in _PARAM1_ of storage _PARAM0_"),
          "",
          "res/actions/fichier24.png",
          "res/actions/fichier.png")
@@ -101,13 +101,13 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsFileExtension(
  extension
      .AddAction(
          "LireFichierExp",
-          _("Load a value"),
-          _("Load the value saved in the specified element and store it in a "
+          _("Read a value"),
+          _("Read the value saved in the specified element and store it in a "
            "scene "
            "variable.\nSpecify the structure leading to the element using / "
            "(example : Root/Level/Current)\nSpaces are forbidden in element "
            "names."),
-          _("Load _PARAM1_ from storage _PARAM0_ and store value in _PARAM3_"),
+          _("Read _PARAM1_ from storage _PARAM0_ and store value in _PARAM3_"),
          "",
          "res/actions/fichier24.png",
          "res/actions/fichier.png")
@@ -119,13 +119,13 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsFileExtension(
  extension
      .AddAction(
          "LireFichierTxt",
-          _("Load a text"),
-          _("Load the text saved in the specified element and store it in a "
+          _("Read a text"),
+          _("Read the text saved in the specified element and store it in a "
            "scene "
            "variable.\nSpecify the structure leading to the element using / "
            "(example : Root/Level/Current)\nSpaces are forbidden in element "
            "names."),
-          _("Load _PARAM1_ from storage _PARAM0_ and store as text in "
+          _("Read _PARAM1_ from storage _PARAM0_ and store as text in "
            "_PARAM3_"),
          "",
          "res/actions/fichier24.png",
--- a/Core/GDCore/Extensions/Builtin/MathematicalToolsExtension.cpp
+++ b/Core/GDCore/Extensions/Builtin/MathematicalToolsExtension.cpp
@@ -96,13 +96,13 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
                     _("Difference between two angles"),
                     "",
                     "res/mathfunction.png")
-      .AddParameter("expression", _("First angle, in degrees"))
-      .AddParameter("expression", _("Second angle, in degrees"));
+      .AddParameter("expression", _("First angle"))
+      .AddParameter("expression", _("Second angle"));

  extension
      .AddExpression("AngleBetweenPositions",
                     _("Angle between two positions"),
-                     _("Compute the angle between two positions (in degrees)."),
+                     _("Compute the angle between two positions."),
                     "",
                     "res/mathfunction.png")
      .AddParameter("expression", _("First point X position"))
@@ -159,8 +159,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
  extension
      .AddExpression("acos",
                     _("Arccosine"),
-                     _("Arccosine, return an angle (in radian). "
-                       "`ToDeg` allows to convert it to degrees."),
+                     _("Arccosine"),
                     "",
                     "res/mathfunction.png")
      .AddParameter("expression", _("Expression"));
@@ -176,8 +175,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
  extension
      .AddExpression("asin",
                     _("Arcsine"),
-                     _("Arcsine, return an angle (in radian). "
-                       "`ToDeg` allows to convert it to degrees."),
+                     _("Arcsine"),
                     "",
                     "res/mathfunction.png")
      .AddParameter("expression", _("Expression"));
@@ -193,8 +191,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
  extension
      .AddExpression("atan",
                     _("Arctangent"),
-                     _("Arctangent, return an angle (in radian). "
-                       "`ToDeg` allows to convert it to degrees."),
+                     _("Arctangent"),
                     "",
                     "res/mathfunction.png")
      .AddParameter("expression", _("Expression"));
@@ -232,15 +229,6 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
                     "res/mathfunction.png")
      .AddParameter("expression", _("Expression"));

-  extension
-      .AddExpression("ceilTo",
-                     _("Ceil (round up) to a decimal point"),
-                     _("Round number up to the Nth decimal place"),
-                     "",
-                     "res/mathfunction.png")
-      .AddParameter("expression", _("Expression"))
-      .AddParameter("expression", _("Expression"), "", true);
-
  extension
      .AddExpression("floor",
                     _("Floor (round down)"),
@@ -249,20 +237,10 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
                     "res/mathfunction.png")
      .AddParameter("expression", _("Expression"));

-  extension
-      .AddExpression("floorTo",
-                     _("Floor (round down) to a decimal point"),
-                     _("Round number down to the Nth decimal place"),
-                     "",
-                     "res/mathfunction.png")
-      .AddParameter("expression", _("Expression"))
-      .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))`."),
+                     _("Cosine of a number"),
                     "",
                     "res/mathfunction.png")
      .AddParameter("expression", _("Expression"));
@@ -317,15 +295,6 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
                     "res/mathfunction.png")
      .AddParameter("expression", _("Expression"));

-  extension
-      .AddExpression("roundTo",
-                     _("Round to a decimal point"),
-                     _("Round a number to the Nth decimal place"),
-                     "",
-                     "res/mathfunction.png")
-      .AddParameter("expression", _("Expression"))
-      .AddParameter("expression", _("Expression"), "", true);
-
  extension
      .AddExpression("exp",
                     _("Exponential"),
@@ -404,8 +373,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
  extension
      .AddExpression("sin",
                     _("Sine"),
-                     _("Sine of an angle (in radian). "
-                       "If you want to use degrees, use`ToRad`: `sin(ToRad(45))`."),
+                     _("Sine of a number"),
                     "",
                     "res/mathfunction.png")
      .AddParameter("expression", _("Expression"));
@@ -429,8 +397,7 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
  extension
      .AddExpression("tan",
                     _("Tangent"),
-                     _("Tangent of an angle (in radian). "
-                       "If you want to use degrees, use`ToRad`: `tan(ToRad(45))`."),
+                     _("Tangent of a number"),
                     "",
                     "res/mathfunction.png")
      .AddParameter("expression", _("Expression"));
@@ -485,23 +452,6 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
      .AddParameter("expression", _("Angle, in degrees"))
      .AddParameter("expression", _("Distance"));

-  extension
-      .AddExpression("Pi",
-                     _("Number Pi (3.1415...)"),
-                     _("The number Pi (3.1415...)"),
-                     "",
-                     "res/mathfunction.png")
-      .SetHelpPath("/all-features/expressions");
-
-  extension
-      .AddExpression("lerpAngle",
-                     _("Lerp (Linear interpolation) between two angles"),
-                     _("Linearly interpolates between two angles (in degrees) by taking the shortest direction around the circle."),
-                     "",
-                     "res/mathfunction.png")
-      .AddParameter("expression", _("Starting angle, in degrees"))
-      .AddParameter("expression", _("Destination angle, in degrees"))
-      .AddParameter("expression", _("Interpolation value between 0 and 1."));
 }

 }  // namespace gd
--- a/Core/GDCore/Extensions/Builtin/MouseExtension.cpp
+++ b/Core/GDCore/Extensions/Builtin/MouseExtension.cpp
@@ -27,8 +27,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(
      .SetCategory("Input");
  extension.AddInstructionOrExpressionGroupMetadata(_("Mouse and touch"))
      .SetIcon("res/actions/mouse24.png");
-  extension.AddInstructionOrExpressionGroupMetadata(_("Multitouch"))
-      .SetIcon("res/conditions/touch24.png");

  extension
      .AddCondition(
@@ -155,91 +153,42 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(
  extension
      .AddExpressionAndCondition(
          "number",
-          "CursorX",
+          "MouseX",
          _("Cursor X position"),
          _("the X position of the cursor or of a touch"),
          _("the cursor (or touch) X position"),
          "",
          "res/conditions/mouse24.png")
      .AddCodeOnlyParameter("currentScene", "")
-      .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
-      .AddParameter("layer", _("Layer"), "", true)
+      .UseStandardParameters("number")
+      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
      .SetDefaultValue("\"\"")
      .AddParameter("expression", _("Camera number (default : 0)"), "", true)
      .SetDefaultValue("0");

  // Support for deprecated names:
-  extension.AddDuplicatedCondition("MouseX", "CursorX").SetHidden();
-  extension.AddDuplicatedExpression("MouseX", "CursorX").SetHidden();
-  extension.AddDuplicatedCondition("SourisX", "CursorX").SetHidden();
-  extension.AddDuplicatedExpression("SourisX", "CursorX").SetHidden();
+  extension.AddDuplicatedCondition("SourisX", "MouseX").SetHidden();
+  extension.AddDuplicatedExpression("SourisX", "MouseX").SetHidden();

  extension
      .AddExpressionAndCondition(
          "number",
-          "CursorY",
+          "MouseY",
          _("Cursor Y position"),
          _("the Y position of the cursor or of a touch"),
          _("the cursor (or touch) Y position"),
          "",
          "res/conditions/mouse24.png")
      .AddCodeOnlyParameter("currentScene", "")
-      .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
-      .AddParameter("layer", _("Layer"), "", true)
+      .UseStandardParameters("number")
+      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
      .SetDefaultValue("\"\"")
      .AddParameter("expression", _("Camera number (default : 0)"), "", true)
      .SetDefaultValue("0");

  // Support for deprecated names:
-  extension.AddDuplicatedCondition("MouseY", "CursorY").SetHidden();
-  extension.AddDuplicatedExpression("MouseY", "CursorY").SetHidden();
-  extension.AddDuplicatedCondition("SourisY", "CursorY").SetHidden();
-  extension.AddDuplicatedExpression("SourisY", "CursorY").SetHidden();
-
-  extension
-      .AddExpressionAndCondition("number",
-                                 "MouseOnlyCursorX",
-                                 _("Mouse cursor X position"),
-                                 _("the X position of the mouse cursor"),
-                                 _("the mouse cursor X position"),
-                                 "",
-                                 "res/conditions/mouse24.png")
-      .AddCodeOnlyParameter("currentScene", "")
-      .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
-      .AddParameter("layer", _("Layer"), "", true)
-      .SetDefaultValue("\"\"")
-      .AddParameter("expression", _("Camera number (default : 0)"), "", true)
-      .SetDefaultValue("0")
-      // It's only useful for extensions as they can't use TouchSimulateMouse.
-      .SetHidden();
-
-  extension
-      .AddExpressionAndCondition("number",
-                                 "MouseOnlyCursorY",
-                                 _("Mouse cursor Y position"),
-                                 _("the Y position of the mouse cursor"),
-                                 _("the mouse cursor Y position"),
-                                 "",
-                                 "res/conditions/mouse24.png")
-      .AddCodeOnlyParameter("currentScene", "")
-      .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
-      .AddParameter("layer", _("Layer"), "", true)
-      .SetDefaultValue("\"\"")
-      .AddParameter("expression", _("Camera number (default : 0)"), "", true)
-      .SetDefaultValue("0")
-      // It's only useful for extensions as they can't use TouchSimulateMouse.
-      .SetHidden();
-
-  extension
-      .AddCondition("IsMouseInsideCanvas",
-                    _("Mouse cursor is inside the window"),
-                    _("Check if the mouse cursor is inside the window."),
-                    _("The mouse cursor is inside the window"),
-                    "",
-                    "res/conditions/mouse24.png",
-                    "res/conditions/mouse.png")
-      .AddCodeOnlyParameter("currentScene", "")
-      .MarkAsAdvanced();
+  extension.AddDuplicatedCondition("SourisY", "MouseY").SetHidden();
+  extension.AddDuplicatedExpression("SourisY", "MouseY").SetHidden();

  extension
      .AddCondition("MouseButtonPressed",
@@ -316,8 +265,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(
                                 "res/conditions/touch24.png")
      .AddCodeOnlyParameter("currentScene", "")
      .AddParameter("expression", _("Touch identifier"))
-      .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
-      .AddParameter("layer", _("Layer"), "", true)
+      .UseStandardParameters("number")
+      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
      .SetDefaultValue("\"\"")
      .AddParameter("expression", _("Camera number (default : 0)"), "", true)
      .SetDefaultValue("0");
@@ -332,8 +281,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(
                                 "res/conditions/touch24.png")
      .AddCodeOnlyParameter("currentScene", "")
      .AddParameter("expression", _("Touch identifier"))
-      .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
-      .AddParameter("layer", _("Layer"), "", true)
+      .UseStandardParameters("number")
+      .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
      .SetDefaultValue("\"\"")
      .AddParameter("expression", _("Camera number (default : 0)"), "", true)
      .SetDefaultValue("0");
@@ -351,8 +300,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(
          _("Multitouch"),
          "res/conditions/touch24.png",
          "res/conditions/touch.png")
-      .AddCodeOnlyParameter("currentScene", "")
-      .SetHidden();
+      .AddCodeOnlyParameter("currentScene", "");

  extension
      .AddCondition(
@@ -367,95 +315,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(
          _("Multitouch"),
          "res/conditions/touch24.png",
          "res/conditions/touch.png")
-      .AddCodeOnlyParameter("currentScene", "")
-      .SetHidden();
-
-  extension
-      .AddCondition(
-          "HasAnyTouchStarted",
-          _("A new touch has started"),
-          _("Check if a touch has just started on this frame. The touch "
-            "identifiers can be "
-            "accessed using StartedTouchId() and StartedTouchCount()."),
-          _("A new touch has started"),
-          _("Multitouch"),
-          "res/conditions/touch24.png",
-          "res/conditions/touch.png")
-      .AddCodeOnlyParameter("currentScene", "")
-      .SetHidden();
-
-  extension
-      .AddExpression("StartedTouchCount",
-                     _("Started touch count"),
-                     _("The number of touches that have just started on this "
-                       "frame. The touch identifiers can be "
-                       "accessed using StartedTouchId()."),
-                     _("Multitouch"),
-                     "res/conditions/touch.png")
-      .AddCodeOnlyParameter("currentScene", "")
-      .SetHidden();
-
-  extension
-      .AddExpression("StartedTouchId",
-                     _("Started touch identifier"),
-                     _("The identifier of the touch that has just started on "
-                       "this frame. The number of touches can be "
-                       "accessed using StartedTouchCount()."),
-                     _("Multitouch"),
-                     "res/conditions/touch.png")
-      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("expression", _("Touch index"))
-      .SetHidden();
-
-  extension
-      .AddCondition(
-          "HasAnyTouchOrMouseStarted",
-          _("A new touch has started"),
-          _("Check if a touch has just started or the mouse left button has "
-            "been pressed on this frame. The touch identifiers can be "
-            "accessed using StartedTouchOrMouseId() and "
-            "StartedTouchOrMouseCount()."),
-          _("A new touch has started"),
-          _("Multitouch"),
-          "res/conditions/touch24.png",
-          "res/conditions/touch.png")
      .AddCodeOnlyParameter("currentScene", "");

-  extension
-      .AddExpression(
-          "StartedTouchOrMouseCount",
-          _("Started touch count"),
-          _("The number of touches (including the mouse) that have just "
-            "started on this frame. The touch identifiers can be "
-            "accessed using StartedTouchOrMouseId()."),
-          _("Multitouch"),
-          "res/conditions/touch.png")
-      .AddCodeOnlyParameter("currentScene", "");
-
-  extension
-      .AddExpression(
-          "StartedTouchOrMouseId",
-          _("Started touch identifier"),
-          _("The identifier of the touch or mouse that has just started on "
-            "this frame. The number of touches can be "
-            "accessed using StartedTouchOrMouseCount()."),
-          _("Multitouch"),
-          "res/conditions/touch.png")
-      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("expression", _("Touch index"));
-
-  extension
-      .AddCondition("HasTouchEnded",
-                    _("A touch has ended"),
-                    _("Check if a touch has ended or a mouse left button has "
-                      "been released."),
-                    _("The touch with identifier _PARAM1_ has ended"),
-                    _("Multitouch"),
-                    "res/conditions/touch24.png",
-                    "res/conditions/touch.png")
-      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("expression", _("Touch identifier"));
-
  extension
      .AddExpression("MouseWheelDelta",
                     _("Mouse wheel: Displacement"),
@@ -470,8 +331,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(
                     _("Identifier of the last touch"),
                     _("Multitouch"),
                     "res/conditions/touch.png")
-      .AddCodeOnlyParameter("currentScene", "")
-      .SetHidden();
+      .AddCodeOnlyParameter("currentScene", "");

  extension
      .AddExpression("LastEndedTouchId",
@@ -479,8 +339,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(
                     _("Identifier of the last ended touch"),
                     _("Multitouch"),
                     "res/conditions/touch.png")
-      .AddCodeOnlyParameter("currentScene", "")
-      .SetHidden();
+      .AddCodeOnlyParameter("currentScene", "");
 }

 }  // namespace gd
--- a/Core/GDCore/Extensions/Builtin/NetworkExtension.cpp
+++ b/Core/GDCore/Extensions/Builtin/NetworkExtension.cpp
@@ -48,7 +48,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsNetworkExtension(
      .AddParameter("string", "Content type", "", true)
      .SetParameterLongDescription(
          "If empty, \"application/x-www-form-urlencoded\" will be used.")
-      .AddParameter("scenevar", "Response scene variable", "", true)
+      .AddParameter("scenevar", "Reponse scene variable", "", true)
      .SetParameterLongDescription(
          "The response of the server will be stored, as a string, in this "
          "variable. If the server returns *JSON*, you may want to use the "
--- a/Core/GDCore/Extensions/Builtin/SceneExtension.cpp
+++ b/Core/GDCore/Extensions/Builtin/SceneExtension.cpp
@@ -5,7 +5,6 @@
 */
 #include "AllBuiltinExtensions.h"
 #include "GDCore/Tools/Localization.h"
-#include "GDCore/Extensions/Metadata/MultipleInstructionMetadata.h"

 using namespace std;
 namespace gd {
@@ -55,19 +54,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSceneExtension(
      .AddCodeOnlyParameter("currentScene", "")
      .MarkAsSimple();

-  extension
-      .AddCondition("DoesSceneExist",
-                    _("Does scene exist"),
-                    _("Check if a scene exists."),
-                    _("Scene _PARAM1_ exists"),
-                    "",
-                    "res/actions/texte.png",
-                    "res/actions/texte.png")
-      .SetHelpPath("/interface/scene-editor/events")
-      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("sceneName", _("Name of the scene to check"))
-      .MarkAsSimple();
-
  extension
      .AddAction("Scene",
                 _("Change the scene"),
@@ -126,7 +112,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSceneExtension(

  extension
      .AddAction("SceneBackground",
-                 _("Background color"),
+                 _("Change background color"),
                 _("Change the background color of the scene."),
                 _("Set background color to _PARAM1_"),
                 "",
@@ -150,59 +136,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSceneExtension(
      .AddCodeOnlyParameter("currentScene", "")
      .AddParameter("yesorno", _("Deactivate input when focus is lost"))
      .MarkAsAdvanced();
-
-  extension
-      .AddCondition(
-          "HasGameJustResumed",
-          _("Game has just resumed"),
-          _("Check if the game has just resumed from being hidden. It "
-            "happens when the game tab is selected, a minimized window is "
-            "restored or the application is put back on front."),
-          _("Game has just resumed"),
-          "",
-          "res/actions/window24.png",
-          "res/actions/window.png")
-      .SetHelpPath("/interface/scene-editor/events")
-      .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")
-      .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")
-      .SetHelpPath("/all-features/resources-loading")
-      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("sceneName", _("Scene name"))
-      .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
-      .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")
-      .SetHelpPath("/all-features/resources-loading")
-      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("sceneName", _("Scene name"))
-      .MarkAsAdvanced();
 }

 }  // namespace gd
--- a/Core/GDCore/Extensions/Builtin/SpriteExtension/Direction.cpp
+++ b/Core/GDCore/Extensions/Builtin/SpriteExtension/Direction.cpp
@@ -4,10 +4,8 @@
 * reserved. This project is released under the MIT License.
 */
 #include "GDCore/Extensions/Builtin/SpriteExtension/Direction.h"
-
 #include <iostream>
 #include <vector>
-
 #include "GDCore/CommonTools.h"
 #include "GDCore/Extensions/Builtin/SpriteExtension/Sprite.h"
 #include "GDCore/Serialization/SerializerElement.h"
@@ -31,15 +29,6 @@ const Sprite& Direction::GetSprite(std::size_t nb) const { return sprites[nb]; }

 Sprite& Direction::GetSprite(std::size_t nb) { return sprites[nb]; }

-const std::vector<gd::String>& Direction::GetSpriteNames() const {
-  static std::vector<gd::String> spriteNames;
-  spriteNames.clear();
-  for (std::size_t i = 0; i < sprites.size(); ++i) {
-    spriteNames.push_back(sprites[i].GetImageName());
-  }
-  return spriteNames;
-}
-
 void Direction::RemoveSprite(std::size_t index) {
  if (index < sprites.size()) sprites.erase(sprites.begin() + index);
 }
@@ -110,11 +99,11 @@ void Direction::UnserializeFrom(const gd::SerializerElement& element) {
            .GetBoolAttribute("automatic", true));

    if (spriteElement.HasChild("CustomCollisionMask"))
-      sprite.SetFullImageCollisionMask(
+      sprite.SetCollisionMaskAutomatic(
          !spriteElement.GetChild("CustomCollisionMask")
               .GetBoolAttribute("custom", false));
    else
-      sprite.SetFullImageCollisionMask(
+      sprite.SetCollisionMaskAutomatic(
          !spriteElement.GetBoolAttribute("hasCustomCollisionMask", false));

    std::vector<Polygon2d> mask;
@@ -132,7 +121,7 @@ void Direction::UnserializeFrom(const gd::SerializerElement& element) {
            polygonElement.GetChild(k);

        polygon.vertices.push_back(
-            gd::Vector2f(verticeElement.GetDoubleAttribute("x"),
+            sf::Vector2f(verticeElement.GetDoubleAttribute("x"),
                         verticeElement.GetDoubleAttribute("y")));
      }

@@ -173,7 +162,7 @@ void SaveSpritesDirection(const vector<Sprite>& sprites,
        .SetAttribute("automatic", sprites[i].IsDefaultCenterPoint());

    spriteElement.SetAttribute("hasCustomCollisionMask",
-                               !sprites[i].IsFullImageCollisionMask());
+                               !sprites[i].IsCollisionMaskAutomatic());

    gd::SerializerElement& collisionMaskElement =
        spriteElement.AddChild("customCollisionMask");
--- a/Core/GDCore/Extensions/Builtin/SpriteExtension/Direction.h
+++ b/Core/GDCore/Extensions/Builtin/SpriteExtension/Direction.h
@@ -72,13 +72,6 @@ class GD_CORE_API Direction {
   */
  Sprite& GetSprite(std::size_t nb);

-  /**
-   * \brief Return a vector of references to sprite names.
-   *
-   * \return A vector of all sprite names references.
-   */
-  const std::vector<gd::String>& GetSpriteNames() const;
-
  /**
   * \brief Check if the direction contains sprites.
   *
--- a/Core/GDCore/Extensions/Builtin/SpriteExtension/Point.h
+++ b/Core/GDCore/Extensions/Builtin/SpriteExtension/Point.h
@@ -31,7 +31,7 @@ class GD_CORE_API Point {
  /**
   * Change point position.
   */
-  void SetXY(double x_, double y_) {
+  void SetXY(float x_, float y_) {
    x = x_;
    y = y_;
  }
@@ -39,27 +39,27 @@ class GD_CORE_API Point {
  /**
   * Change point X position.
   */
-  void SetX(double x_) { x = x_; }
+  void SetX(float x_) { x = x_; }

  /**
   * Change point Y position.
   */
-  void SetY(double y_) { y = y_; }
+  void SetY(float y_) { y = y_; }

  /**
   * Get point X position.
   */
-  double GetX() const { return x; }
+  float GetX() const { return x; }

  /**
   * Get point Y position.
   */
-  double GetY() const { return y; }
+  float GetY() const { return y; }

 private:
  gd::String name;
-  double x;
-  double y;
+  float x;
+  float y;
 };

 #endif  // GDCORE_POINT_H
--- a/Core/GDCore/Extensions/Builtin/SpriteExtension/Polygon2d.cpp
+++ b/Core/GDCore/Extensions/Builtin/SpriteExtension/Polygon2d.cpp
@@ -4,15 +4,13 @@
 * reserved. This project is released under the MIT License.
 */
 #include "Polygon2d.h"
-
+#include <SFML/System/Vector2.hpp>
 #include <cmath>
 #include <iostream>

-#include "GDCore/Vector2.h"
-
-void Polygon2d::Rotate(double angle) {
-  double t, cosa = cos(-angle),
-            sina = sin(-angle);  // We want a clockwise rotation
+void Polygon2d::Rotate(float angle) {
+  float t, cosa = cos(-angle),
+           sina = sin(-angle);  // We want a clockwise rotation

  for (std::size_t i = 0; i < vertices.size(); ++i) {
    t = vertices[i].x;
@@ -21,7 +19,7 @@ void Polygon2d::Rotate(double angle) {
  }
 }

-void Polygon2d::Move(double x, double y) {
+void Polygon2d::Move(float x, float y) {
  for (std::size_t i = 0; i < vertices.size(); i++) {
    vertices[i].x += x;
    vertices[i].y += y;
@@ -30,7 +28,7 @@ void Polygon2d::Move(double x, double y) {
 }

 void Polygon2d::ComputeEdges() const {
-  gd::Vector2f v1, v2;
+  sf::Vector2f v1, v2;
  edges.clear();

  for (std::size_t i = 0; i < vertices.size(); i++) {
@@ -52,20 +50,20 @@ bool Polygon2d::IsConvex() const {
      (edges[0].x * edges[0 + 1].y - edges[0].y * edges[0 + 1].x) > 0;

  for (std::size_t i = 1; i < edges.size() - 1; ++i) {
-    double zCrossProduct =
+    float zCrossProduct =
        edges[i].x * edges[i + 1].y - edges[i].y * edges[i + 1].x;
    if ((zCrossProduct > 0) != zProductIsPositive) return false;
  }

-  double lastZCrossProduct = edges[edges.size() - 1].x * edges[0].y -
-                             edges[edges.size() - 1].y * edges[0].x;
+  float lastZCrossProduct = edges[edges.size() - 1].x * edges[0].y -
+                            edges[edges.size() - 1].y * edges[0].x;
  if ((lastZCrossProduct > 0) != zProductIsPositive) return false;

  return true;
 }

-gd::Vector2f Polygon2d::ComputeCenter() const {
-  gd::Vector2f center;
+sf::Vector2f Polygon2d::ComputeCenter() const {
+  sf::Vector2f center;

  for (std::size_t i = 0; i < vertices.size(); i++) {
    center.x += vertices[i].x;
@@ -77,12 +75,12 @@ gd::Vector2f Polygon2d::ComputeCenter() const {
  return center;
 }

-Polygon2d Polygon2d::CreateRectangle(double width, double height) {
+Polygon2d Polygon2d::CreateRectangle(float width, float height) {
  Polygon2d rect;
-  rect.vertices.push_back(gd::Vector2f(-width / 2.0f, -height / 2.0f));
-  rect.vertices.push_back(gd::Vector2f(+width / 2.0f, -height / 2.0f));
-  rect.vertices.push_back(gd::Vector2f(+width / 2.0f, +height / 2.0f));
-  rect.vertices.push_back(gd::Vector2f(-width / 2.0f, +height / 2.0f));
+  rect.vertices.push_back(sf::Vector2f(-width / 2.0f, -height / 2.0f));
+  rect.vertices.push_back(sf::Vector2f(+width / 2.0f, -height / 2.0f));
+  rect.vertices.push_back(sf::Vector2f(+width / 2.0f, +height / 2.0f));
+  rect.vertices.push_back(sf::Vector2f(-width / 2.0f, +height / 2.0f));

  return rect;
 }
--- a/Core/GDCore/Extensions/Builtin/SpriteExtension/Polygon2d.h
+++ b/Core/GDCore/Extensions/Builtin/SpriteExtension/Polygon2d.h
@@ -5,10 +5,9 @@
 */
 #ifndef GDCORE_POLYGON_H
 #define GDCORE_POLYGON_H
+#include <SFML/System/Vector2.hpp>
 #include <vector>

-#include "GDCore/Vector2.h"
-
 /**
 * \brief Represents a polygon. Usually used for collisions masks.
 *
@@ -23,19 +22,19 @@ class GD_CORE_API Polygon2d {
  Polygon2d(){};
  virtual ~Polygon2d(){};

-  std::vector<gd::Vector2f> vertices;  ///< The vertices composing the polygon
-  mutable std::vector<gd::Vector2f>
+  std::vector<sf::Vector2f> vertices;  ///< The vertices composing the polygon
+  mutable std::vector<sf::Vector2f>
      edges;  ///< Edges. Can be computed from vertices using ComputeEdges()

  /**
   * \brief Get the vertices composing the polygon.
   */
-  std::vector<gd::Vector2f>& GetVertices() { return vertices; }
+  std::vector<sf::Vector2f>& GetVertices() { return vertices; }

  /**
   * \brief Get the vertices composing the polygon.
   */
-  const std::vector<gd::Vector2f>& GetVertices() const { return vertices; }
+  const std::vector<sf::Vector2f>& GetVertices() const { return vertices; }

  /**
   * \brief Moves each vertices from the given amount.
@@ -43,7 +42,7 @@ class GD_CORE_API Polygon2d {
   * \note Edges are updated, there is no need to call ComputeEdges after
   * calling Move.
   */
-  void Move(double x, double y);
+  void Move(float x, float y);

  /**
   * \brief Rotate the polygon.
@@ -53,7 +52,7 @@ class GD_CORE_API Polygon2d {
   * \warning edges vector is not updated, you have to call ComputeEdges if
   * needed.
   */
-  void Rotate(double angle);
+  void Rotate(float angle);

  /**
   * \brief Automatically fill edges vector using vertices.
@@ -69,7 +68,7 @@ class GD_CORE_API Polygon2d {
  /**
   * \brief Return the position of the center of the polygon
   */
-  gd::Vector2f ComputeCenter() const;
+  sf::Vector2f ComputeCenter() const;

  /** \name Tools
   * Tool functions
@@ -78,7 +77,7 @@ class GD_CORE_API Polygon2d {
  /**
   * \brief Create a rectangle
   */
-  static Polygon2d CreateRectangle(double width, double height);
+  static Polygon2d CreateRectangle(float width, float height);
  ///@}
 };

--- a/Core/GDCore/Extensions/Builtin/SpriteExtension/Sprite.cpp
+++ b/Core/GDCore/Extensions/Builtin/SpriteExtension/Sprite.cpp
@@ -4,9 +4,8 @@
 * reserved. This project is released under the MIT License.
 */
 #include "GDCore/Extensions/Builtin/SpriteExtension/Sprite.h"
-
+#include <SFML/Graphics/Sprite.hpp>
 #include <iostream>
-
 #include "GDCore/Extensions/Builtin/SpriteExtension/Polygon2d.h"

 using namespace std;
@@ -16,10 +15,11 @@ namespace gd {
 Point Sprite::badPoint("");

 Sprite::Sprite()
-    : fullImageCollisionMask(false),
+    : automaticCollisionMask(true),
      origine("origine"),
      centre("centre"),
-      automaticCentre(true) {}
+      automaticCentre(true) {
+}

 Sprite::~Sprite(){};

--- a/Core/GDCore/Extensions/Builtin/SpriteExtension/Sprite.h
+++ b/Core/GDCore/Extensions/Builtin/SpriteExtension/Sprite.h
@@ -6,8 +6,8 @@

 #ifndef SPRITE_H
 #define SPRITE_H
+#include <SFML/Graphics/Sprite.hpp>
 #include <memory>
-
 #include "GDCore/Extensions/Builtin/SpriteExtension/Point.h"
 #include "GDCore/Extensions/Builtin/SpriteExtension/Polygon2d.h"
 #include "GDCore/String.h"
@@ -44,7 +44,7 @@ class GD_CORE_API Sprite {

  /**
   * \brief Get the collision mask (custom or automatically generated owing to
-   * IsFullImageCollisionMask())
+   * IsCollisionMaskAutomatic())
   *
   * \warning If the image has not been loaded ( using LoadImage ) and the
   * collision mask is set as automatic, the returned mask won't be correct.
@@ -67,7 +67,7 @@ class GD_CORE_API Sprite {

  /**
   * \brief Set the custom collision mask.
-   * Call then `SetFullImageCollisionMask(false)` to use it.
+   * Call then `SetCollisionMaskAutomatic(false)` to use it.
   */
  void SetCustomCollisionMask(const std::vector<Polygon2d>& collisionMask);

@@ -75,15 +75,15 @@ class GD_CORE_API Sprite {
   * \brief Return true if the collision mask is a bounding box, false if a
   * custom collision mask is used.
   */
-  inline bool IsFullImageCollisionMask() const {
-    return fullImageCollisionMask;
+  inline bool IsCollisionMaskAutomatic() const {
+    return automaticCollisionMask;
  }

  /**
   * \brief Un/set use of the custom collision mask.
   */
-  inline void SetFullImageCollisionMask(bool enabled) {
-    fullImageCollisionMask = enabled;
+  inline void SetCollisionMaskAutomatic(bool enabled) {
+    automaticCollisionMask = enabled;
  };

  /**
@@ -162,9 +162,9 @@ class GD_CORE_API Sprite {
 private:
  gd::String image;  ///< Name of the image to be loaded in Image Manager.

-  bool fullImageCollisionMask;  ///< True to use a bounding box wrapping the
-                                ///< whole image as collision mask. If false,
-                                ///< custom collision mask is used.
+  bool automaticCollisionMask;  ///< True to use the custom collision mask.
+                                ///< Otherwise, a basic bounding box is returned
+                                ///< by GetCollisionMask()
  std::vector<Polygon2d> customCollisionMask;  ///< Custom collision mask

  std::vector<Point> points;  ///< List of the points used by the sprite
--- a/Core/GDCore/Extensions/Builtin/SpriteExtension/SpriteExtension.cpp
+++ b/Core/GDCore/Extensions/Builtin/SpriteExtension/SpriteExtension.cpp
@@ -2,7 +2,7 @@
 * GDevelop Core
 * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
 * reserved. This project is released under the GNU Lesser General Public
- * License.
+ * LicenFse.
 */
 #include "GDCore/Extensions/Builtin/AllBuiltinExtensions.h"
 #include "GDCore/Extensions/Builtin/SpriteExtension/SpriteObject.h"
@@ -22,27 +22,18 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                               "Florian Rival",
                               "Open source (MIT License)")
      .SetExtensionHelpPath("/objects/sprite");
-  extension.AddInstructionOrExpressionGroupMetadata(_("Sprite"))
-      .SetIcon("CppPlatform/Extensions/spriteicon.png");

  gd::ObjectMetadata& obj =
      extension
          .AddObject<SpriteObject>("Sprite",
                                   _("Sprite"),
                                   _("Animated object which can be used for "
-                                     "most elements of a game."),
+                                     "most elements of a game"),
                                   "CppPlatform/Extensions/spriteicon.png")
-          .SetCategoryFullName(_("General"))
-          .AddDefaultBehavior("EffectCapability::EffectBehavior")
-          .AddDefaultBehavior("ResizableCapability::ResizableBehavior")
-          .AddDefaultBehavior("ScalableCapability::ScalableBehavior")
-          .AddDefaultBehavior("FlippableCapability::FlippableBehavior")
-          .AddDefaultBehavior("OpacityCapability::OpacityBehavior")
-          .AddDefaultBehavior("AnimatableCapability::AnimatableBehavior");
+          .SetCategoryFullName(_("General"));

-  // Deprecated
  obj.AddAction("Opacity",
-                _("Sprite opacity"),
+                _("Change sprite opacity"),
                _("Change the opacity of a Sprite. 0 is fully transparent, 255 "
                  "is opaque (default)."),
                _("the opacity"),
@@ -51,14 +42,9 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                "res/actions/opacity.png")

      .AddParameter("object", _("Object"), "Sprite")
-      .UseStandardOperatorParameters(
-          "number",
-          ParameterOptions::MakeNewOptions().SetDescription(
-              _("Opacity (0-255)")))
-      .MarkAsSimple()
-      .SetHidden();
+      .UseStandardOperatorParameters("number")
+      .MarkAsSimple();

-  // Deprecated
  obj.AddAction("ChangeAnimation",
                _("Change the animation"),
                _("Change the animation of the object, using the animation "
@@ -69,12 +55,9 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                "res/actions/animation.png")

      .AddParameter("object", _("Object"), "Sprite")
-      .UseStandardOperatorParameters("number",
-                                     ParameterOptions::MakeNewOptions())
-      .SetHidden()
+      .UseStandardOperatorParameters("number")
      .MarkAsSimple();

-  // Deprecated
  obj.AddAction("SetAnimationName",
                _("Change the animation (by name)"),
                _("Change the animation of the object, using the name of the "
@@ -86,7 +69,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(

      .AddParameter("object", _("Object"), "Sprite")
      .AddParameter("objectAnimationName", _("Animation name"))
-      .SetHidden()
      .MarkAsAdvanced();

  obj.AddAction(
@@ -97,13 +79,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
           "is in 8 directions mode, the valid directions are 0..7"),
         _("the direction"),
         _("Direction"),
-         "res/actions/direction24_black.png",
-         "res/actions/direction_black.png")
+         "res/actions/direction24.png",
+         "res/actions/direction.png")
      .SetHidden()  // Hide as 8 direction is not supported officially in the
                    // interface.
      .AddParameter("object", _("Object"), "Sprite")
-      .UseStandardOperatorParameters("number",
-                                     ParameterOptions::MakeNewOptions())
+      .UseStandardOperatorParameters("number")
      .MarkAsAdvanced();

  obj.AddAction("ChangeSprite",
@@ -115,11 +96,9 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                "res/actions/sprite.png")

      .AddParameter("object", _("Object"), "Sprite")
-      .UseStandardOperatorParameters("number",
-                                     ParameterOptions::MakeNewOptions())
+      .UseStandardOperatorParameters("number")
      .MarkAsAdvanced();

-  // Deprecated
  obj.AddAction("PauseAnimation",
                _("Pause the animation"),
                _("Pause the animation of the object"),
@@ -129,10 +108,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                "res/actions/animation.png")

      .AddParameter("object", _("Object"), "Sprite")
-      .SetHidden()
      .MarkAsSimple();

-  // Deprecated
  obj.AddAction("PlayAnimation",
                _("Play the animation"),
                _("Play the animation of the object"),
@@ -142,10 +119,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                "res/actions/animation.png")

      .AddParameter("object", _("Object"), "Sprite")
-      .SetHidden()
      .MarkAsSimple();

-  // Deprecated
  obj.AddAction(
         "ChangeAnimationSpeedScale",
         _("Animation speed scale"),
@@ -157,20 +132,16 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
         "res/actions/animation.png")

      .AddParameter("object", _("Object"), "Sprite")
-      .UseStandardOperatorParameters(
-          "number",
-          ParameterOptions::MakeNewOptions().SetDescription(_("Speed scale")))
-      .SetHidden()
+      .UseStandardOperatorParameters("number")
      .MarkAsSimple();

-  // Deprecated
  obj.AddAction("TourneVersPos",
                "Rotate an object toward a position",
                "Rotate an object towards a position.",
                "Rotate _PARAM0_ towards _PARAM1_;_PARAM2_",
                _("Direction"),
-                "res/actions/rotate24_black.png",
-                "res/actions/rotate_black.png")
+                "res/actions/direction24.png",
+                "res/actions/direction.png")

      .AddParameter("object", _("Object to be rotated"), "Sprite")
      .AddParameter("expression", _("X position"))
@@ -178,135 +149,105 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
      .AddParameter("expression", _("Angular speed (degrees per second)"))
      .SetDefaultValue("0")
      .AddCodeOnlyParameter("currentScene", "")
-      .SetHidden();
+      .SetHidden();  // Deprecated

-  // Deprecated
  obj.AddAction("ChangeScale",
                _("Scale"),
                _("Modify the scale of the specified object."),
                _("the scale"),
                _("Size"),
-                "res/actions/scale24_black.png",
-                "res/actions/scale_black.png")
+                "res/actions/scale24.png",
+                "res/actions/scale.png")

      .AddParameter("object", _("Object"), "Sprite")
-      .UseStandardOperatorParameters(
-          "number",
-          ParameterOptions::MakeNewOptions().SetDescription(
-              _("Scale (1 by default)")))
-      .MarkAsAdvanced()
-      .SetHidden();
+      .UseStandardOperatorParameters("number")
+      .MarkAsAdvanced();

-  // Deprecated
  obj.AddAction("ChangeScaleWidth",
                _("Scale on X axis"),
                _("Modify the scale of the width of an object."),
                _("the width's scale"),
                _("Size"),
-                "res/actions/scaleWidth24_black.png",
-                "res/actions/scaleWidth_black.png")
+                "res/actions/scale24.png",
+                "res/actions/scale.png")

      .AddParameter("object", _("Object"), "Sprite")
-      .UseStandardOperatorParameters(
-          "number",
-          ParameterOptions::MakeNewOptions().SetDescription(
-              _("Scale (1 by default)")))
-      .MarkAsAdvanced()
-      .SetHidden();
+      .UseStandardOperatorParameters("number")
+      .MarkAsAdvanced();

-  // Deprecated
  obj.AddAction("ChangeScaleHeight",
                _("Scale on Y axis"),
                _("Modify the scale of the height of an object."),
                _("the height's scale"),
                _("Size"),
-                "res/actions/scaleHeight24_black.png",
-                "res/actions/scaleHeight_black.png")
+                "res/actions/scale24.png",
+                "res/actions/scale.png")

      .AddParameter("object", _("Object"), "Sprite")
-      .UseStandardOperatorParameters(
-          "number",
-          ParameterOptions::MakeNewOptions().SetDescription(
-              _("Scale (1 by default)")))
-      .MarkAsAdvanced()
-      .SetHidden();
+      .UseStandardOperatorParameters("number")
+      .MarkAsAdvanced();

-  // Deprecated
  obj.AddAction("ChangeWidth",
                _("Width"),
                _("Change the width of a Sprite object."),
                _("the width"),
                _("Size"),
-                "res/actions/scaleWidth24_black.png",
-                "res/actions/scaleWidth_black.png")
+                "res/actions/scale24.png",
+                "res/actions/scale.png")

      .AddParameter("object", _("Object"), "Sprite")
-      .UseStandardOperatorParameters("number",
-                                     ParameterOptions::MakeNewOptions())
-      .MarkAsAdvanced()
-      .SetHidden();
+      .UseStandardOperatorParameters("number")
+      .MarkAsAdvanced();

-  // Deprecated
  obj.AddCondition("Width",
                   _("Width"),
                   _("Compare the width of a Sprite object."),
                   _("the width"),
                   _("Size"),
-                   "res/conditions/scaleWidth24_black.png",
-                   "res/conditions/scaleWidth_black.png")
+                   "res/conditions/scaleWidth24.png",
+                   "res/conditions/scaleWidth.png")

      .AddParameter("object", _("Object"), "Sprite")
-      .UseStandardRelationalOperatorParameters(
-          "number", ParameterOptions::MakeNewOptions())
-      .MarkAsAdvanced()
-      .SetHidden();
+      .UseStandardRelationalOperatorParameters("number")
+      .MarkAsAdvanced();

-  // Deprecated
  obj.AddAction("ChangeHeight",
                _("Height"),
                _("Change the height of a Sprite object."),
                _("the height"),
                _("Size"),
-                "res/actions/scaleHeight24_black.png",
-                "res/actions/scaleHeight_black.png")
+                "res/actions/scale24.png",
+                "res/actions/scale.png")

      .AddParameter("object", _("Object"), "Sprite")
-      .UseStandardOperatorParameters("number",
-                                     ParameterOptions::MakeNewOptions())
-      .MarkAsAdvanced()
-      .SetHidden();
+      .UseStandardOperatorParameters("number")
+      .MarkAsAdvanced();

-  // Deprecated
  obj.AddCondition("Height",
                   _("Height"),
                   _("Compare the height of a Sprite object."),
                   _("the height"),
                   _("Size"),
-                   "res/conditions/scaleHeight24_black.png",
-                   "res/conditions/scaleHeight_black.png")
+                   "res/conditions/scaleHeight24.png",
+                   "res/conditions/scaleHeight.png")

      .AddParameter("object", _("Object"), "Sprite")
-      .UseStandardRelationalOperatorParameters(
-          "number", ParameterOptions::MakeNewOptions())
-      .MarkAsAdvanced()
-      .SetHidden();
+      .UseStandardRelationalOperatorParameters("number")
+      .MarkAsAdvanced();

-  // Deprecated
  obj.AddAction("SetSize",
                _("Size"),
                _("Change the size of an object."),
                _("Change the size of _PARAM0_: set to _PARAM1_x_PARAM2_"),
                _("Size"),
-                "res/actions/scale24_black.png",
-                "res/actions/scale_black.png")
+                "res/actions/scale24.png",
+                "res/actions/scale.png")

      .AddParameter("object", _("Object"))
      .AddParameter("expression", _("Width"))
      .AddParameter("expression", _("Height"))
-      .MarkAsAdvanced()
-      .SetHidden();
+      .MarkAsAdvanced();

-  // Deprecated
  obj.AddCondition(
         "Animation",
         _("Current animation"),
@@ -317,15 +258,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
         "res/conditions/animation.png")

      .AddParameter("object", _("Object"), "Sprite")
-      .UseStandardRelationalOperatorParameters(
-          "number", ParameterOptions::MakeNewOptions())
-      .SetHidden()
+      .UseStandardRelationalOperatorParameters("number")
      .MarkAsAdvanced();

-  // Deprecated
  obj.AddCondition("AnimationName",
                   _("Current animation name"),
-                   _("Check the animation played by the object."),
+                   _("Check the animation by played by the object."),
                   _("The animation of _PARAM0_ is _PARAM1_"),
                   _("Animations and images"),
                   "res/conditions/animation24.png",
@@ -333,7 +271,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(

      .AddParameter("object", _("Object"), "Sprite")
      .AddParameter("objectAnimationName", _("Animation name"))
-      .SetHidden()
      .MarkAsAdvanced();

  obj.AddCondition(
@@ -344,13 +281,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
           "from 0 to 7. Otherwise, the direction is in degrees."),
         _("the direction"),
         _("Direction"),
-         "res/conditions/direction24_black.png",
-         "res/conditions/direction_black.png")
+         "res/conditions/direction24.png",
+         "res/conditions/direction.png")
      .SetHidden()  // Hide as 8 direction is not supported officially in the
                    // interface.
      .AddParameter("object", _("Object"), "Sprite")
-      .UseStandardRelationalOperatorParameters(
-          "number", ParameterOptions::MakeNewOptions());
+      .UseStandardRelationalOperatorParameters("number");

  obj.AddCondition("Sprite",
                   _("Current frame"),
@@ -363,11 +299,9 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                   "res/conditions/sprite.png")

      .AddParameter("object", _("Object"), "Sprite")
-      .UseStandardRelationalOperatorParameters(
-          "number", ParameterOptions::MakeNewOptions())
+      .UseStandardRelationalOperatorParameters("number")
      .MarkAsAdvanced();

-  // Deprecated
  obj.AddCondition("AnimStopped",
                   _("Animation paused"),
                   _("Check if the animation of an object is paused."),
@@ -377,10 +311,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                   "res/conditions/animation.png")

      .AddParameter("object", _("Object"), "Sprite")
-      .SetHidden()
      .MarkAsSimple();

-  // Deprecated
  obj.AddCondition("AnimationEnded",
                   _("Animation finished"),
                   _("Check if the animation being played by the Sprite object "
@@ -391,56 +323,32 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                   "res/conditions/animation.png")

      .AddParameter("object", _("Object"), "Sprite")
-      .MarkAsSimple()
-      .SetHidden();
-
-  // Deprecated
-  obj.AddCondition("AnimationEnded2",
-                   _("Animation finished"),
-                   _("Check if the animation being played by the Sprite object "
-                     "is finished."),
-                   _("The animation of _PARAM0_ is finished"),
-                   _("Animations and images"),
-                   "res/conditions/animation24.png",
-                   "res/conditions/animation.png")
-
-      .AddParameter("object", _("Object"), "Sprite")
-      .SetHidden()
      .MarkAsSimple();

-  // Deprecated
  obj.AddCondition("ScaleWidth",
                   _("Scale on X axis"),
                   _("Compare the scale of the width of an object."),
                   _("the width's scale"),
                   _("Size"),
-                   "res/conditions/scaleWidth24_black.png",
-                   "res/conditions/scaleWidth_black.png")
-      .SetHidden()
+                   "res/conditions/scaleWidth24.png",
+                   "res/conditions/scaleWidth.png")
+
      .AddParameter("object", _("Object"), "Sprite")
-      .UseStandardRelationalOperatorParameters(
-          "number",
-          ParameterOptions::MakeNewOptions().SetDescription(
-              _("Scale (1 by default)")))
+      .UseStandardRelationalOperatorParameters("number")
      .MarkAsAdvanced();

-  // Deprecated
  obj.AddCondition("ScaleHeight",
                   _("Scale on Y axis"),
                   _("Compare the scale of the height of an object."),
                   _("the height's scale"),
                   _("Size"),
-                   "res/conditions/scaleHeight24_black.png",
-                   "res/conditions/scaleHeight_black.png")
-      .SetHidden()
+                   "res/conditions/scaleHeight24.png",
+                   "res/conditions/scaleHeight.png")
+
      .AddParameter("object", _("Object"), "Sprite")
-      .UseStandardRelationalOperatorParameters(
-          "number",
-          ParameterOptions::MakeNewOptions().SetDescription(
-              _("Scale (1 by default)")))
+      .UseStandardRelationalOperatorParameters("number")
      .MarkAsAdvanced();

-  // Deprecated
  obj.AddCondition("Opacity",
                   _("Opacity"),
                   _("Compare the opacity of a Sprite, between 0 (fully "
@@ -451,12 +359,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                   "res/conditions/opacity.png")

      .AddParameter("object", _("Object"), "Sprite")
-      .UseStandardRelationalOperatorParameters(
-          "number",
-          ParameterOptions::MakeNewOptions().SetDescription(
-              _("Opacity to compare to (0-255)")))
-      .MarkAsSimple()
-      .SetHidden();
+      .UseStandardRelationalOperatorParameters("number")
+      .MarkAsSimple();

  obj.AddCondition(
         "BlendMode",
@@ -468,8 +372,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
         "res/conditions/opacity.png")

      .AddParameter("object", _("Object"), "Sprite")
-      .UseStandardRelationalOperatorParameters(
-          "number", ParameterOptions::MakeNewOptions())
+      .UseStandardRelationalOperatorParameters("number")
      .MarkAsAdvanced();

  obj.AddAction("ChangeColor",
@@ -504,9 +407,9 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                _("Effects"),
                "res/actions/flipX24.png",
                "res/actions/flipX.png")
+
      .AddParameter("object", _("Object"), "Sprite")
      .AddParameter("yesorno", _("Activate flipping"))
-      .SetHidden()
      .MarkAsSimple();

  obj.AddAction("FlipY",
@@ -516,9 +419,9 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                _("Effects"),
                "res/actions/flipY24.png",
                "res/actions/flipY.png")
+
      .AddParameter("object", _("Object"), "Sprite")
      .AddParameter("yesorno", _("Activate flipping"))
-      .SetHidden()
      .MarkAsSimple();

  obj.AddCondition("FlippedX",
@@ -528,8 +431,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                   _("Effects"),
                   "res/actions/flipX24.png",
                   "res/actions/flipX.png")
-      .AddParameter("object", _("Object"), "Sprite")
-      .SetHidden();
+
+      .AddParameter("object", _("Object"), "Sprite");

  obj.AddCondition("FlippedY",
                   _("Vertically flipped"),
@@ -538,28 +441,27 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                   _("Effects"),
                   "res/actions/flipY24.png",
                   "res/actions/flipY.png")
-      .AddParameter("object", _("Object"), "Sprite")
-      .SetHidden();

-  // Deprecated
+      .AddParameter("object", _("Object"), "Sprite");
+
  obj.AddAction("TourneVers",
                "Rotate an object toward another",
                "Rotate an object towards another.",
                "Rotate _PARAM0_ towards _PARAM1_",
                _("Direction"),
-                "res/actions/rotate24_black.png",
-                "res/actions/rotate_black.png")
+                "res/actions/direction24.png",
+                "res/actions/direction.png")

      .AddParameter("object", _("Object"), "Sprite")
      .AddParameter("objectPtr", "Rotate toward this object")
      .AddCodeOnlyParameter("currentScene", "")
-      .SetHidden();
+      .SetHidden();  // Deprecated

  obj.AddExpression("X",
                    _("X position of a point"),
                    _("X position of a point"),
                    _("Position"),
-                    "res/actions/position_black.png")
+                    "res/actions/position.png")
      .SetHidden()
      .AddParameter("object", _("Object"), "Sprite")
      .AddParameter("objectPointName", _("Name of the point"), "", true);
@@ -568,7 +470,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                    _("Y position of a point"),
                    _("Y position of a point"),
                    _("Position"),
-                    "res/actions/position_black.png")
+                    "res/actions/position.png")
      .SetHidden()
      .AddParameter("object", _("Object"), "Sprite")
      .AddParameter("objectPointName", _("Name of the point"), "", true);
@@ -577,7 +479,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                    _("X position of a point"),
                    _("X position of a point"),
                    _("Position"),
-                    "res/actions/position_black.png")
+                    "res/actions/position.png")

      .AddParameter("object", _("Object"), "Sprite")
      .AddParameter("objectPointName", _("Name of the point"));
@@ -586,31 +488,28 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                    _("Y position of a point"),
                    _("Y position of a point"),
                    _("Position"),
-                    "res/actions/position_black.png")
+                    "res/actions/position.png")

      .AddParameter("object", _("Object"), "Sprite")
      .AddParameter("objectPointName", _("Name of the point"));

-  // Deprecated
  obj.AddExpression("Direc",
                    _("Direction"),
                    _("Direction of the object"),
                    _("Direction"),
-                    "res/actions/direction_black.png")
+                    "res/actions/direction.png")
      .SetHidden()
      .AddParameter("object", _("Object"), "Sprite");

-  // Deprecated
  obj.AddExpression("Direction",
                    _("Direction"),
                    _("Direction of the object"),
                    _("Direction"),
-                    "res/actions/direction_black.png")
+                    "res/actions/direction.png")
      .SetHidden()  // Hide as 8 direction is not supported officially in the
                    // interface.
      .AddParameter("object", _("Object"), "Sprite");

-  // Deprecated
  obj.AddExpression("Anim",
                    _("Animation"),
                    _("Animation of the object"),
@@ -619,71 +518,54 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
      .SetHidden()
      .AddParameter("object", _("Object"), "Sprite");

-  // Deprecated
  obj.AddExpression("Animation",
                    _("Animation"),
                    _("Animation of the object"),
                    _("Animations and images"),
                    "res/actions/animation.png")
-      .SetHidden()
      .AddParameter("object", _("Object"), "Sprite");

-  // Deprecated
  obj.AddStrExpression("AnimationName",
                       _("Animation name"),
                       _("Name of the animation of the object"),
                       _("Animations and images"),
                       "res/actions/animation.png")
-      .SetHidden()
      .AddParameter("object", _("Object"), "Sprite");

  obj.AddExpression("Sprite",
                    _("Image"),
-                    _("Current frame of the animation of the object"),
+                    _("Animation frame of the object"),
                    _("Animations and images"),
                    "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")
-      .AddParameter("object", _("Object"), "Sprite");
-
-  // Deprecated
  obj.AddExpression("AnimationSpeedScale",
                    _("Animation speed scale"),
                    _("Animation speed scale"),
                    _("Animations and images"),
                    "res/actions/animation.png")
-      .SetHidden()
      .AddParameter("object", _("Object"), "Sprite");

  obj.AddExpression("ScaleX",
                    _("Scale of the width of an object"),
                    _("Scale of the width of an object"),
                    _("Size"),
-                    "res/actions/scaleWidth_black.png")
-      .SetHidden()
+                    "res/actions/scaleWidth.png")
      .AddParameter("object", _("Object"), "Sprite");

  obj.AddExpression("ScaleY",
                    _("Scale of the height of an object"),
                    _("Scale of the height of an object"),
                    _("Size"),
-                    "res/actions/scaleHeight_black.png")
-      .SetHidden()
+                    "res/actions/scaleHeight.png")
      .AddParameter("object", _("Object"), "Sprite");

-  // Deprecated
  obj.AddExpression("Opacity",
                    _("Opacity"),
                    _("Opacity"),
                    _("Opacity"),
                    "res/actions/opacity.png")
-      .AddParameter("object", _("Object"), "Sprite")
-      .SetHidden();
+      .AddParameter("object", _("Object"), "Sprite");

  extension
      .AddCondition("Collision",
--- a/Core/GDCore/Extensions/Builtin/SpriteExtension/SpriteObject.cpp
+++ b/Core/GDCore/Extensions/Builtin/SpriteExtension/SpriteObject.cpp
@@ -6,6 +6,7 @@

 #include "GDCore/Extensions/Builtin/SpriteExtension/SpriteObject.h"

+#include <SFML/Graphics.hpp>
 #include <algorithm>

 #include "GDCore/CommonTools.h"
@@ -25,16 +26,14 @@ namespace gd {

 Animation SpriteObject::badAnimation;

-SpriteObject::SpriteObject()
-    : updateIfNotVisible(false), adaptCollisionMaskAutomatically(true) {}
+SpriteObject::SpriteObject(gd::String name_)
+    : Object(name_), updateIfNotVisible(false) {}

 SpriteObject::~SpriteObject(){};

 void SpriteObject::DoUnserializeFrom(gd::Project& project,
                                     const gd::SerializerElement& element) {
  updateIfNotVisible = element.GetBoolAttribute("updateIfNotVisible", true);
-  adaptCollisionMaskAutomatically =
-      element.GetBoolAttribute("adaptCollisionMaskAutomatically", false);

  RemoveAllAnimations();
  const gd::SerializerElement& animationsElement =
@@ -83,8 +82,6 @@ void SpriteObject::DoUnserializeFrom(gd::Project& project,

 void SpriteObject::DoSerializeTo(gd::SerializerElement& element) const {
  element.SetAttribute("updateIfNotVisible", updateIfNotVisible);
-  element.SetAttribute("adaptCollisionMaskAutomatically",
-                       adaptCollisionMaskAutomatically);

  // Animations
  gd::SerializerElement& animationsElement = element.AddChild("animations");
--- a/Core/GDCore/Extensions/Builtin/SpriteExtension/SpriteObject.h
+++ b/Core/GDCore/Extensions/Builtin/SpriteExtension/SpriteObject.h
@@ -36,18 +36,19 @@ namespace gd {
 * \see gd::BuiltinExtensionsImplementer::ImplementsSpriteExtension
 * \ingroup SpriteObjectExtension
 */
-class GD_CORE_API SpriteObject : public gd::ObjectConfiguration {
+class GD_CORE_API SpriteObject : public gd::Object {
 public:
-  SpriteObject();
+  SpriteObject(gd::String name_);
  virtual ~SpriteObject();
-  std::unique_ptr<gd::ObjectConfiguration> Clone() const override {
+  std::unique_ptr<gd::Object> Clone() const override {
    return gd::make_unique<SpriteObject>(*this);
  }

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

  std::map<gd::String, gd::PropertyDescriptor> GetProperties() const override;
-  bool UpdateProperty(const gd::String& name, const gd::String& value) override;
+  bool UpdateProperty(const gd::String& name,
+                      const gd::String& value) override;

  std::map<gd::String, gd::PropertyDescriptor> GetInitialInstanceProperties(
      const gd::InitialInstance& position,
@@ -117,30 +118,14 @@ class GD_CORE_API SpriteObject : public gd::ObjectConfiguration {
  const std::vector<Animation>& GetAllAnimations() const { return animations; }

  /**
-   * @brief Check if the collision mask adapts automatically to the animation.
+   * \brief Set if the object animation should be played even if the object is hidden
+   * or far from the camera.
   */
-  bool AdaptCollisionMaskAutomatically() const {
-    return adaptCollisionMaskAutomatically;
-  }
+  void SetUpdateIfNotVisible(bool updateIfNotVisible_) { updateIfNotVisible = updateIfNotVisible_; }

  /**
-   * @brief Set if the collision mask adapts automatically to the animation.
-   */
-  void SetAdaptCollisionMaskAutomatically(bool enable) {
-    adaptCollisionMaskAutomatically = enable;
-  }
-
-  /**
-   * \brief Set if the object animation should be played even if the object is
-   * hidden or far from the camera.
-   */
-  void SetUpdateIfNotVisible(bool updateIfNotVisible_) {
-    updateIfNotVisible = updateIfNotVisible_;
-  }
-
-  /**
-   * \brief Check if the object animation should be played even if the object
-   * is hidden or far from the camera (false by default).
+   * \brief Check if the object animation should be played even if the object is hidden
+   * or far from the camera (false by default).
   */
  bool GetUpdateIfNotVisible() const { return updateIfNotVisible; }
  ///@}
@@ -152,15 +137,11 @@ class GD_CORE_API SpriteObject : public gd::ObjectConfiguration {

  mutable std::vector<Animation> animations;
  bool updateIfNotVisible;  ///< If set to true, ask the game engine to play
-                            ///< object animation even if hidden or far from
-                            ///< the screen.
+                            ///< object animation even if hidden or far from the
+                            ///< screen.

-  static Animation badAnimation;         //< Bad animation when an out of bound
-                                         // animation is requested.
-  bool adaptCollisionMaskAutomatically;  ///< If set to true, the collision
-                                         ///< mask will be automatically
-                                         ///< adapted to the animation of the
-                                         ///< object.
+  static Animation badAnimation;  //< Bad animation when an out of bound
+                                  // animation is requested.
 };

 }  // namespace gd
--- a/Core/GDCore/Extensions/Builtin/StringInstructionsExtension.cpp
+++ b/Core/GDCore/Extensions/Builtin/StringInstructionsExtension.cpp
@@ -21,20 +21,20 @@ BuiltinExtensionsImplementer::ImplementsStringInstructionsExtension(
          "Open source (MIT License)")
      .SetExtensionHelpPath("" /*TODO: Add a documentation page for this */);
  extension.AddInstructionOrExpressionGroupMetadata(_("Text manipulation"))
-      .SetIcon("res/actions/text24_black.png");
+      .SetIcon("res/actions/text24.png");

  extension.AddStrExpression("NewLine",
                             _("Insert a new line"),
                             _("Insert a new line"),
                             "",
-                             "res/conditions/toujours24_black.png");
+                             "res/conditions/toujours24.png");

  extension
      .AddStrExpression("FromCodePoint",
                        _("Get character from code point"),
                        _("Get character from code point"),
                        "",
-                        "res/conditions/toujours24_black.png")
+                        "res/conditions/toujours24.png")

      .AddParameter("expression", _("Code point"));

@@ -43,7 +43,7 @@ BuiltinExtensionsImplementer::ImplementsStringInstructionsExtension(
                        _("Uppercase a text"),
                        _("Uppercase a text"),
                        "",
-                        "res/conditions/toujours24_black.png")
+                        "res/conditions/toujours24.png")

      .AddParameter("string", _("Text"));

@@ -52,7 +52,7 @@ BuiltinExtensionsImplementer::ImplementsStringInstructionsExtension(
                        _("Lowercase a text"),
                        _("Lowercase a text"),
                        "",
-                        "res/conditions/toujours24_black.png")
+                        "res/conditions/toujours24.png")

      .AddParameter("string", _("Text"));

@@ -61,7 +61,7 @@ BuiltinExtensionsImplementer::ImplementsStringInstructionsExtension(
                        _("Get a portion of a text"),
                        _("Get a portion of a text"),
                        "",
-                        "res/conditions/toujours24_black.png")
+                        "res/conditions/toujours24.png")

      .AddParameter("string", _("Text"))
      .AddParameter("expression",
@@ -74,7 +74,7 @@ BuiltinExtensionsImplementer::ImplementsStringInstructionsExtension(
                        _("Get a character from a text"),
                        _("Get a character from a text"),
                        "",
-                        "res/conditions/toujours24_black.png")
+                        "res/conditions/toujours24.png")

      .AddParameter("string", _("Text"))
      .AddParameter(
@@ -86,7 +86,7 @@ BuiltinExtensionsImplementer::ImplementsStringInstructionsExtension(
                        _("Repeat a text"),
                        _("Repeat a text"),
                        "",
-                        "res/conditions/toujours24_black.png")
+                        "res/conditions/toujours24.png")

      .AddParameter("string", _("Text to repeat"))
      .AddParameter("expression", _("Repetition count"));
@@ -96,7 +96,7 @@ BuiltinExtensionsImplementer::ImplementsStringInstructionsExtension(
                     _("Length of a text"),
                     _("Length of a text"),
                     "",
-                     "res/conditions/toujours24_black.png")
+                     "res/conditions/toujours24.png")

      .AddParameter("string", _("Text"));

@@ -106,7 +106,7 @@ BuiltinExtensionsImplementer::ImplementsStringInstructionsExtension(
                     _("Search in a text (return the position of the result or "
                       "-1 if not found)"),
                     "",
-                     "res/conditions/toujours24_black.png")
+                     "res/conditions/toujours24.png")

      .AddParameter("string", _("Text"))
      .AddParameter("string", _("Text to search for"));
@@ -117,7 +117,7 @@ BuiltinExtensionsImplementer::ImplementsStringInstructionsExtension(
                     "Search in a text from the end (return the position of "
                     "the result or -1 if not found)",
                     "",
-                     "res/conditions/toujours24_black.png")
+                     "res/conditions/toujours24.png")

      .AddParameter("string", _("Text"))
      .AddParameter("string", _("Text to search for"))
@@ -126,12 +126,12 @@ BuiltinExtensionsImplementer::ImplementsStringInstructionsExtension(
  extension
      .AddExpression(
          "StrFindLast",
-          _("Search the last occurrence in a text"),
-          _("Search the last occurrence in a string (return the position of "
+          _("Search the last occurence in a text"),
+          _("Search the last occurence in a string (return the position of "
            "the result, from the beginning of the string, or -1 if not "
            "found)"),
          "",
-          "res/conditions/toujours24_black.png")
+          "res/conditions/toujours24.png")

      .AddParameter("string", _("Text"))
      .AddParameter("string", _("Text to search for"));
@@ -142,7 +142,7 @@ BuiltinExtensionsImplementer::ImplementsStringInstructionsExtension(
                     _("Search in a text, starting from a position (return the "
                       "position of the result or -1 if not found)"),
                     "",
-                     "res/conditions/toujours24_black.png")
+                     "res/conditions/toujours24.png")

      .AddParameter("string", _("Text"))
      .AddParameter("string", _("Text to search for"))
@@ -157,7 +157,7 @@ BuiltinExtensionsImplementer::ImplementsStringInstructionsExtension(
          "Search in a text from the end, starting from a position (return "
          "the position of the result or -1 if not found)",
          "",
-          "res/conditions/toujours24_black.png")
+          "res/conditions/toujours24.png")

      .AddParameter("string", _("Text"))
      .AddParameter("string", _("Text to search for"))
@@ -169,13 +169,13 @@ BuiltinExtensionsImplementer::ImplementsStringInstructionsExtension(
  extension
      .AddExpression(
          "StrFindLastFrom",
-          _("Search the last occurrence in a text, starting from a position"),
-          _("Search in a text the last occurrence, starting from a position "
+          _("Search the last occurence in a text, starting from a position"),
+          _("Search in a text the last occurence, starting from a position "
            "(return "
-            "the position of the result, from the beginning of the string, or "
+            " the position of the result, from the beginning of the string, or "
            "-1 if not found)"),
          "",
-          "res/conditions/toujours24_black.png")
+          "res/conditions/toujours24.png")

      .AddParameter("string", _("Text"))
      .AddParameter("string", _("Text to search for"))
@@ -183,26 +183,6 @@ BuiltinExtensionsImplementer::ImplementsStringInstructionsExtension(
                    _("Position of the last character in the string to be "
                      "considered in the search"));

-  extension
-      .AddStrExpression("StrReplaceOne",
-                        _("Replace the first occurrence of a text by another."),
-                        _("Replace the first occurrence of a text by another."),
-                        "",
-                        "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"));
-
-  extension
-      .AddStrExpression("StrReplaceAll",
-                        _("Replace all occurrences of a text by another."),
-                        _("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 to find inside the first text"))
-      .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
@@ -20,8 +20,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsTimeExtension(
          "for slow motion effects).",
          "Florian Rival",
          "Open source (MIT License)")
-      .SetExtensionHelpPath("/all-features/timers-and-time");
-  extension.AddInstructionOrExpressionGroupMetadata(_("Timers and time"))
+      .SetExtensionHelpPath("/all-features/timers");
+  extension.AddInstructionOrExpressionGroupMetadata(
+      _("Timers and time")
+  )
      .SetIcon("res/conditions/timer24.png");

  // Deprecated and replaced by CompareTimer
@@ -36,7 +38,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsTimeExtension(
                    "res/conditions/timer.png")
      .AddCodeOnlyParameter("currentScene", "")
      .AddParameter("expression", _("Time in seconds"))
-      .AddParameter("identifier", _("Timer's name"), "sceneTimer")
+      .AddParameter("string", _("Timer's name"))
      .SetHidden();

  extension
@@ -50,7 +52,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsTimeExtension(
                    "res/conditions/timer24.png",
                    "res/conditions/timer.png")
      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("identifier", _("Timer's name"), "sceneTimer")
+      .AddParameter("string", _("Timer's name"))
      .AddParameter("relationalOperator", _("Sign of the test"), "time")
      .AddParameter("expression", _("Time in seconds"))
      .SetManipulatedType("number");
@@ -65,10 +67,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsTimeExtension(
                    "res/conditions/time24.png",
                    "res/conditions/time.png")
      .AddCodeOnlyParameter("currentScene", "")
-      .UseStandardRelationalOperatorParameters(
-          "number",
-          gd::ParameterOptions::MakeNewOptions().SetDescription(
-              _("Time scale (1 by default)")))
+      .UseStandardRelationalOperatorParameters("number")
      .MarkAsAdvanced();

  extension
@@ -81,7 +80,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsTimeExtension(
                    "res/conditions/timerPaused24.png",
                    "res/conditions/timerPaused.png")
      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("identifier", _("Timer's name"), "sceneTimer")
+      .AddParameter("string", _("Timer's name"))
      .MarkAsAdvanced();

  extension
@@ -96,7 +95,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsTimeExtension(
          "res/actions/timer24.png",
          "res/actions/timer.png")
      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("identifier", _("Timer's name"), "sceneTimer");
+      .AddParameter("string", _("Timer's name"));

  extension
      .AddAction("PauseTimer",
@@ -108,7 +107,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsTimeExtension(
                 "res/actions/pauseTimer24.png",
                 "res/actions/pauseTimer.png")
      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("identifier", _("Timer's name"), "sceneTimer")
+      .AddParameter("string", _("Timer's name"))
      .MarkAsAdvanced();

  extension
@@ -121,7 +120,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsTimeExtension(
                 "res/actions/unPauseTimer24.png",
                 "res/actions/unPauseTimer.png")
      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("identifier", _("Timer's name"), "sceneTimer")
+      .AddParameter("string", _("Timer's name"))
      .MarkAsAdvanced();

  extension
@@ -134,14 +133,15 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsTimeExtension(
                 "res/actions/timer24.png",
                 "res/actions/timer.png")
      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("identifier", _("Timer's name"), "sceneTimer")
+      .AddParameter("string", _("Timer's name"))
      .MarkAsAdvanced();

  extension
      .AddAction("ChangeTimeScale",
-                 _("Time scale"),
+                 _("Change time scale"),
                 _("Change the time scale of the scene."),
                 _("Set the time scale of the scene to _PARAM1_"),
+
                 "",
                 "res/actions/time24.png",
                 "res/actions/time.png")
@@ -149,18 +149,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsTimeExtension(
      .AddParameter("expression",
                    _("Scale (1: Default, 2: 2x faster, 0.5: 2x slower...)"));

-  extension
-      .AddAction("Wait",
-                 _("Wait X seconds"),
-                 _("Waits a number of seconds before running "
-                   "the next actions (and sub-events)."),
-                 _("Wait _PARAM0_ seconds"),
-                 "",
-                 "res/timer_black.svg",
-                 "res/timer_black.svg")
-      .AddParameter("expression", _("Time to wait in seconds"))
-      .SetHelpPath("/all-features/timers-and-time/wait-action");
-
  extension
      .AddExpression("TimeDelta",
                     _("Time elapsed since the last frame"),
@@ -194,7 +182,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsTimeExtension(
                     "",
                     "res/actions/time.png")
      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("identifier", _("Timer's name"), "sceneTimer");
+      .AddParameter("string", _("Timer's name"));

  extension
      .AddExpression("TimeFromStart",
--- a/Core/GDCore/Extensions/Builtin/VariablesExtension.cpp
+++ b/Core/GDCore/Extensions/Builtin/VariablesExtension.cpp
@@ -27,32 +27,30 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(

  extension
      .AddCondition("VarScene",
-                    _("Number variable"),
-                    _("Compare the number value of a scene variable."),
-                    _("The number of scene variable _PARAM0_"),
+                    _("Value of a scene variable"),
+                    _("Compare the value of a scene variable."),
+                    _("the scene variable _PARAM0_"),
                    _("Scene variables"),
                    "res/conditions/var24.png",
                    "res/conditions/var.png")
      .AddParameter("scenevar", _("Variable"))
-      .UseStandardRelationalOperatorParameters(
-          "number", ParameterOptions::MakeNewOptions());
+      .UseStandardRelationalOperatorParameters("number");

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

  extension
      .AddCondition(
          "SceneVariableAsBoolean",
-          _("Boolean variable"),
+          _("Boolean value of a scene variable"),
          _("Compare the boolean value of a scene variable."),
          _("The boolean value of scene variable _PARAM0_ is _PARAM1_"),
          _("Scene variables"),
@@ -63,14 +61,14 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
      .SetDefaultValue("true");

  extension
-      .AddCondition("VariableChildExists",
-                    _("Child existence"),
-                    _("Check if the specified child of the scene structure "
-                      "variable exists."),
-                    _("Child _PARAM1_ of scene variable _PARAM0_ exists"),
-                    _("Scene variables/Arrays and structures"),
-                    "res/conditions/var24.png",
-                    "res/conditions/var.png")
+      .AddCondition(
+          "VariableChildExists",
+          _("Child existence"),
+          _("Check if the specified child of the scene variable exists."),
+          _("Child _PARAM1_ of scene variable _PARAM0_ exists"),
+          _("Scene variables/Collections/Structures"),
+          "res/conditions/var24.png",
+          "res/conditions/var.png")
      .AddParameter("scenevar", _("Variable"))
      .AddParameter("string", _("Name of the child"))
      .MarkAsAdvanced();
@@ -78,10 +76,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
  extension
      .AddCondition("GlobalVariableChildExists",
                    _("Child existence"),
-                    _("Check if the specified child of the global structure "
+                    _("Check if the specified child of the global "
                      "variable exists."),
                    _("Child _PARAM1_ of global variable _PARAM0_ exists"),
-                    _("Global variables/Arrays and structures"),
+                    _("Global variables/Collections/Structures"),
                    "res/conditions/var24.png",
                    "res/conditions/var.png")
      .AddParameter("globalvar", _("Variable"))
@@ -90,7 +88,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(

  extension
      .AddCondition("VarSceneDef",
-                    "Variable defined",
+                    "Test if a scene variable is defined",
                    "Test if the scene variable exists.",
                    "Scene variable _PARAM0_ is defined",
                    _("Scene variables"),
@@ -98,38 +96,36 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                    "res/conditions/var.png")
      .AddCodeOnlyParameter("currentScene", "")
      .AddParameter("string", _("Variable"))
-      .SetHidden();  // Deprecated.
+      .SetHidden();

  extension
      .AddCondition("VarGlobal",
-                    _("Number variable"),
-                    _("Compare the number value of a global variable."),
+                    _("Value of a global variable"),
+                    _("Compare the value of a global variable."),
                    _("the global variable _PARAM0_"),
                    _("Global variables"),
                    "res/conditions/var24.png",
                    "res/conditions/var.png")
      .AddParameter("globalvar", _("Variable"))
-      .UseStandardRelationalOperatorParameters(
-          "number", ParameterOptions::MakeNewOptions())
+      .UseStandardRelationalOperatorParameters("number")
      .MarkAsAdvanced();

  extension
      .AddCondition("VarGlobalTxt",
-                    _("Text variable"),
-                    _("Compare the text (string) of a global variable."),
+                    _("Text of a global variable"),
+                    _("Compare the text of a global variable."),
                    _("the text of the global variable _PARAM0_"),
                    _("Global variables"),
                    "res/conditions/var24.png",
                    "res/conditions/var.png")
      .AddParameter("globalvar", _("Variable"))
-      .UseStandardRelationalOperatorParameters(
-          "string", ParameterOptions::MakeNewOptions())
+      .UseStandardRelationalOperatorParameters("string")
      .MarkAsAdvanced();

  extension
      .AddCondition(
          "GlobalVariableAsBoolean",
-          _("Boolean variable"),
+          _("Boolean value of a global variable"),
          _("Compare the boolean value of a global variable."),
          _("The boolean value of global variable _PARAM0_ is _PARAM1_"),
          _("Global variables"),
@@ -141,8 +137,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(

  extension
      .AddCondition("VarGlobalDef",
-                    "Variable defined",
-                    "Test if a global variable exists.",
+                    "Test if a global variable is defined",
+                    "Test if a global variable exists",
                    "Global variable _PARAM0_ is defined",
                    _("Global variables"),
                    "res/conditions/var24.png",
@@ -150,36 +146,34 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
      .AddCodeOnlyParameter("currentScene", "")
      .AddParameter("string", _("Variable"))
      .MarkAsAdvanced()
-      .SetHidden();  // Deprecated.
+      .SetHidden();

  extension
      .AddAction("ModVarScene",
-                 _("Change number variable"),
-                 _("Modify the number value of a scene variable."),
+                 _("Value of a scene variable"),
+                 _("Change the value of a scene variable."),
                 _("the scene variable _PARAM0_"),
                 _("Scene variables"),
                 "res/actions/var24.png",
                 "res/actions/var.png")
      .AddParameter("scenevar", _("Variable"))
-      .UseStandardOperatorParameters("number",
-                                     ParameterOptions::MakeNewOptions());
+      .UseStandardOperatorParameters("number");

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

  extension
      .AddAction(
          "SetSceneVariableAsBoolean",
-          _("Change boolean variable"),
+          _("Boolean value of a scene variable"),
          _("Modify the boolean value of a scene variable."),
          _("Set the boolean value of scene variable _PARAM0_ to _PARAM1_"),
          _("Scene variables"),
@@ -190,7 +184,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(

  extension
      .AddAction("ToggleSceneVariableAsBoolean",
-                 _("Toggle boolean variable"),
+                 _("Toggle boolean value of a scene variable"),
                 _("Toggle the boolean value of a scene variable.") + "\n" +
                     _("If it was true, it will become false, and if it was "
                       "false it will become true."),
@@ -202,34 +196,32 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(

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

  extension
      .AddAction("ModVarGlobalTxt",
-                 _("Change text variable"),
-                 _("Modify the text (string) of a global variable."),
+                 _("String of a global variable"),
+                 _("Modify the text of a global variable."),
                 _("the text of global variable _PARAM0_"),
                 _("Global variables"),
                 "res/actions/var24.png",
                 "res/actions/var.png")
      .AddParameter("globalvar", _("Variable"))
-      .UseStandardOperatorParameters("string",
-                                     ParameterOptions::MakeNewOptions())
+      .UseStandardOperatorParameters("string")
      .MarkAsAdvanced();

  extension
      .AddAction(
          "SetGlobalVariableAsBoolean",
-          _("Change boolean variable"),
+          _("Boolean value of a global variable"),
          _("Modify the boolean value of a global variable."),
          _("Set the boolean value of global variable _PARAM0_ to _PARAM1_"),
          _("Global variables"),
@@ -240,7 +232,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(

  extension
      .AddAction("ToggleGlobalVariableAsBoolean",
-                 _("Toggle boolean variable"),
+                 _("Toggle boolean value of a global variable"),
                 _("Toggle the boolean value of a global variable.") + "\n" +
                     _("If it was true, it will become false, and if it was "
                       "false it will become true."),
@@ -251,324 +243,202 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
      .AddParameter("globalvar", _("Variable"));

  extension
-      .AddAction(
-          "VariableRemoveChild",
-          _("Remove a child"),
-          _("Remove a child from a scene structure variable."),
-          _("Remove child _PARAM1_ from scene structure variable _PARAM0_"),
-          _("Scene variables/Arrays and structures"),
-          "res/actions/var24.png",
-          "res/actions/var.png")
-      .AddParameter("scenevar", _("Structure variable"))
+      .AddAction("VariableRemoveChild",
+                 _("Remove a child"),
+                 _("Remove a child from a scene variable."),
+                 _("Remove child _PARAM1_ from scene variable _PARAM0_"),
+                 _("Scene variables/Collections/Structures"),
+                 "res/actions/var24.png",
+                 "res/actions/var.png")
+      .AddParameter("scenevar", _("Variable"))
      .AddParameter("string", _("Child's name"))
      .MarkAsAdvanced();

  extension
-      .AddAction(
-          "GlobalVariableRemoveChild",
-          _("Remove a child"),
-          _("Remove a child from a global structure variable."),
-          _("Remove child _PARAM1_ from global structure variable _PARAM0_"),
-          _("Global variables/Arrays and structures"),
-          "res/actions/var24.png",
-          "res/actions/var.png")
-      .AddParameter("globalvar", _("Structure variable"))
+      .AddAction("GlobalVariableRemoveChild",
+                 _("Remove a child"),
+                 _("Remove a child from a global variable."),
+                 _("Remove child _PARAM1_ from global variable _PARAM0_"),
+                 _("Global variables/Collections/Structures"),
+                 "res/actions/var24.png",
+                 "res/actions/var.png")
+      .AddParameter("globalvar", _("Variable"))
      .AddParameter("string", _("Child's name"))
      .MarkAsAdvanced();

  extension
      .AddAction("VariableClearChildren",
-                 _("Clear children"),
-                 _("Remove all the children from the scene structure or array "
-                   "variable."),
+                 _("Clear scene variable"),
+                 _("Remove all the children from the scene variable."),
                 _("Clear children from scene variable _PARAM0_"),
-                 _("Scene variables/Arrays and structures"),
+                 _("Scene variables/Collections"),
                 "res/actions/var24.png",
                 "res/actions/var.png")
-      .AddParameter("scenevar", _("Structure or array variable"))
+      .AddParameter("scenevar", _("Variable"))
      .MarkAsAdvanced();

  extension
      .AddAction("GlobalVariableClearChildren",
-                 _("Clear children"),
-                 _("Remove all the children from the global structure or array "
-                   "variable."),
+                 _("Clear global variable"),
+                 _("Remove all the children from the global variable."),
                 _("Clear children from global variable _PARAM0_"),
-                 _("Global variables/Arrays and structures"),
+                 _("Global variables/Collections"),
                 "res/actions/var24.png",
                 "res/actions/var.png")
-      .AddParameter("globalvar", _("Structure or array variable"))
+      .AddParameter("globalvar", _("Variable"))
      .MarkAsAdvanced();

  extension
      .AddAction("SceneVariablePush",
-                 _("Add existing variable"),
-                 _("Adds an existing variable at the end of a scene array "
-                   "variable."),
-                 _("Add variable _PARAM1_ to array variable _PARAM0_"),
-                 _("Scene variables/Arrays and structures"),
+                 _("Append variable to a scene array"),
+                 _("Appends a variable at the end of a scene array variable."),
+                 _("Append variable _PARAM1_ to array variable _PARAM0_"),
+                 _("Scene variables/Collections/Arrays"),
                 "res/actions/var24.png",
                 "res/actions/var.png")
      .AddParameter("scenevar", _("Array variable"))
-      .AddParameter("scenevar", _("Scene variable with the content to add"))
-      .SetParameterLongDescription(
-          _("The content of the variable will *be copied* and added at the "
-            "end of the array."))
+      .AddParameter("scenevar", _("Scene variable with the content to append"))
+      .SetParameterLongDescription(_("The content of the variable will *be copied* and appended at the end of the array."))
      .MarkAsAdvanced();

  extension
-      .AddAction(
-          "SceneVariablePushString",
-          _("Add text variable"),
-          _("Adds a text (string) at the end of a scene array variable."),
-          _("Add text _PARAM1_ to array variable _PARAM0_"),
-          _("Scene variables/Arrays and structures"),
-          "res/actions/var24.png",
-          "res/actions/var.png")
+      .AddAction("SceneVariablePushString",
+                 _("Append a string to a scene array"),
+                 _("Appends a string at the end of a scene array variable."),
+                 _("Append string _PARAM1_ to array variable _PARAM0_"),
+                 _("Scene variables/Collections/Arrays"),
+                 "res/actions/var24.png",
+                 "res/actions/var.png")
      .AddParameter("scenevar", _("Array variable"))
-      .AddParameter("string", _("Text to add"))
+      .AddParameter("string", _("String to append"))
      .MarkAsAdvanced();

  extension
      .AddAction("SceneVariablePushNumber",
-                 _("Add number variable"),
-                 _("Adds a number at the end of a scene array variable."),
-                 _("Add number _PARAM1_ to array variable _PARAM0_"),
-                 _("Scene variables/Arrays and structures"),
+                 _("Append a number to a scene array"),
+                 _("Appends a number at the end of a scene array variable."),
+                 _("Append number _PARAM1_ to array variable _PARAM0_"),
+                 _("Scene variables/Collections/Arrays"),
                 "res/actions/var24.png",
                 "res/actions/var.png")
      .AddParameter("scenevar", _("Array variable"))
-      .AddParameter("expression", _("Number to add"))
+      .AddParameter("expression", _("Number to append"))
      .MarkAsAdvanced();

  extension
      .AddAction("SceneVariablePushBool",
-                 _("Add boolean variable"),
-                 _("Adds a boolean at the end of a scene array variable."),
-                 _("Add boolean _PARAM1_ to array variable _PARAM0_"),
-                 _("Scene variables/Arrays and structures"),
+                 _("Append a boolean to a scene array"),
+                 _("Appends a boolean at the end of a scene array variable."),
+                 _("Append boolean _PARAM1_ to array variable _PARAM0_"),
+                 _("Scene variables/Collections/Arrays"),
                 "res/actions/var24.png",
                 "res/actions/var.png")
      .AddParameter("scenevar", _("Array variable"))
-      .AddParameter("trueorfalse", _("Boolean to add"))
-      .MarkAsAdvanced();
-
-  extension
-      .AddAction("SceneVariableRemoveAt",
-                 _("Remove variable by index"),
-                 _("Removes a variable at the specified index of a scene array "
-                   "variable."),
-                 _("Remove variable at index _PARAM1_ from scene array "
-                   "variable _PARAM0_"),
-                 _("Scene variables/Arrays and structures"),
-                 "res/actions/var24.png",
-                 "res/actions/var.png")
-      .AddParameter("scenevar", _("Array variable"))
-      .AddParameter("expression", _("Index to remove"))
-      .MarkAsAdvanced();
-
-  extension
-      .AddCondition(
-          "SceneVariableChildCount",
-          _("Number of children"),
-          _("Compare the number of children in a scene array variable."),
-          _("The number of children in the array variable _PARAM0_"),
-          _("Scene variables/Arrays and structures"),
-          "res/conditions/var24.png",
-          "res/conditions/var.png")
-      .AddParameter("scenevar", _("Array variable"))
-      .UseStandardRelationalOperatorParameters(
-          "number", ParameterOptions::MakeNewOptions())
-      .MarkAsAdvanced();
-
-  extension
-      .AddStrExpression(
-          "SceneVariableFirstString",
-          _("First text child"),
-          _("Get the value of the first element of a scene array variable, if "
-            "it is a text (string)."),
-          _("Scene variables/Arrays and structures"),
-          "res/actions/var.png")
-      .AddParameter("scenevar", _("Array variable"));
-
-  extension
-      .AddExpression(
-          "SceneVariableFirstNumber",
-          _("First number child"),
-          _("Get the value of the first element of a scene array variable, if "
-            "it is a number."),
-          _("Scene variables/Arrays and structures"),
-          "res/actions/var.png")
-      .AddParameter("scenevar", _("Array variable"));
-
-  extension
-      .AddStrExpression(
-          "SceneVariableLastString",
-          _("Last text child"),
-          _("Get the value of the last element of a scene array variable, if "
-            "it is a text (string)."),
-          _("Scene variables/Arrays and structures"),
-          "res/actions/var.png")
-      .AddParameter("scenevar", _("Array variable"));
-
-  extension
-      .AddExpression(
-          "SceneVariableLastNumber",
-          _("Last number child"),
-          _("Get the value of the last element of a scene array variable, if "
-            "it is a number."),
-          _("Scene variables/Arrays and structures"),
-          "res/actions/var.png")
-      .AddParameter("scenevar", _("Array variable"));
-
-  extension
-      .AddAction(
-          "GlobalVariablePush",
-          _("Add existing variable"),
-          _("Adds an existing variable at the end of a global array variable."),
-          _("Add variable _PARAM1_ to array variable _PARAM0_"),
-          _("Global variables/Arrays and structures"),
-          "res/actions/var24.png",
-          "res/actions/var.png")
-      .AddParameter("globalvar", _("Array variable"))
-      .AddParameter("scenevar", _("Scene variable with the content to add"))
-      .SetParameterLongDescription(
-          _("The content of the variable will *be copied* and added at the "
-            "end of the array."))
-      .MarkAsAdvanced();
-
-  extension
-      .AddAction("GlobalVariableRemoveAt",
-                 _("Remove variable by index"),
-                 _("Removes a variable at the specified index of a global "
-                   "array variable."),
-                 _("Remove variable at index _PARAM1_ from global array "
-                   "variable _PARAM0_"),
-                 _("Global variables/Arrays and structures"),
-                 "res/actions/var24.png",
-                 "res/actions/var.png")
-      .AddParameter("globalvar", _("Array variable"))
-      .AddParameter("expression", _("Index to remove"))
+      .AddParameter("trueorfalse", _("Boolean to append"))
      .MarkAsAdvanced();

  extension
      .AddAction(
-          "GlobalVariablePushString",
-          _("Add text variable"),
-          _("Adds a text (string) at the end of a global array variable."),
-          _("Add text _PARAM1_ to array variable _PARAM0_"),
-          _("Global variables/Arrays and structures"),
+          "SceneVariableRemoveAt",
+          _("Remove variable from a scene array (by index)"),
+          _("Removes a variable at the specified index of a scene array variable."),
+          _("Remove variable at index _PARAM1_ from scene array variable _PARAM0_"),
+          _("Scene variables/Collections/Arrays"),
          "res/actions/var24.png",
          "res/actions/var.png")
+      .AddParameter("scenevar", _("Variable"))
+      .AddParameter("expression", _("Index to remove"))
+      .MarkAsAdvanced();
+
+  extension
+      .AddAction("GlobalVariablePush",
+                 _("Append variable to a global array"),
+                 _("Appends a variable at the end of a global array variable."),
+                 _("Append variable _PARAM1_ to array variable _PARAM0_"),
+                 _("Global variables/Collections/Arrays"),
+                 "res/actions/var24.png",
+                 "res/actions/var.png")
      .AddParameter("globalvar", _("Array variable"))
-      .AddParameter("string", _("Text to add"))
+      .AddParameter("scenevar", _("Scene variable with the content to append"))
+      .SetParameterLongDescription(_("The content of the variable will *be copied* and appended at the end of the array."))
+      .MarkAsAdvanced();
+
+  extension
+      .AddAction(
+          "GlobalVariableRemoveAt",
+          _("Remove variable from a global array (by index)"),
+          _("Removes a variable at the specified index of a global array variable."),
+          _("Remove variable at index _PARAM1_ from global array variable _PARAM0_"),
+          _("Global variables/Collections/Arrays"),
+          "res/actions/var24.png",
+          "res/actions/var.png")
+      .AddParameter("globalvar", _("Variable"))
+      .AddParameter("expression", _("Index to remove"))
+      .MarkAsAdvanced();
+
+  extension
+      .AddAction("GlobalVariablePushString",
+                 _("Append a string to a global array"),
+                 _("Appends a string at the end of a global array variable."),
+                 _("Append string _PARAM1_ to array variable _PARAM0_"),
+                 _("Global variables/Collections/Arrays"),
+                 "res/actions/var24.png",
+                 "res/actions/var.png")
+      .AddParameter("globalvar", _("Array variable"))
+      .AddParameter("string", _("String to append"))
      .MarkAsAdvanced();

  extension
      .AddAction("GlobalVariablePushNumber",
-                 _("Add number variable"),
-                 _("Adds a number at the end of a global array variable."),
-                 _("Add number _PARAM1_ to array variable _PARAM0_"),
-                 _("Global variables/Arrays and structures"),
+                 _("Append a number to a global array"),
+                 _("Appends a number at the end of a global array variable."),
+                 _("Append number _PARAM1_ to array variable _PARAM0_"),
+                 _("Global variables/Collections/Arrays"),
                 "res/actions/var24.png",
                 "res/actions/var.png")
      .AddParameter("globalvar", _("Array variable"))
-      .AddParameter("expression", _("Number to add"))
+      .AddParameter("expression", _("Number to append"))
      .MarkAsAdvanced();

  extension
      .AddAction("GlobalVariablePushBool",
-                 _("Add boolean variable"),
-                 _("Adds a boolean at the end of a global array variable."),
-                 _("Add boolean _PARAM1_ to array variable _PARAM0_"),
-                 _("Global variables/Arrays and structures"),
+                 _("Append a boolean to a global array"),
+                 _("Appends a boolean at the end of a global array variable."),
+                 _("Append boolean _PARAM1_ to array variable _PARAM0_"),
+                 _("Global variables/Collections/Arrays"),
                 "res/actions/var24.png",
                 "res/actions/var.png")
      .AddParameter("globalvar", _("Array variable"))
-      .AddParameter("trueorfalse", _("Boolean to add"))
+      .AddParameter("trueorfalse", _("Boolean to append"))
      .MarkAsAdvanced();

-  extension
-      .AddCondition(
-          "GlobalVariableChildCount",
-          _("Number of children"),
-          _("Compare the number of children in a global array variable."),
-          _("The number of children of the array variable _PARAM0_"),
-          _("Global variables/Arrays and structures"),
-          "res/conditions/var24.png",
-          "res/conditions/var.png")
-      .AddParameter("globalvar", _("Array variable"))
-      .UseStandardRelationalOperatorParameters(
-          "number", ParameterOptions::MakeNewOptions())
-      .MarkAsAdvanced();
-
-  extension
-      .AddStrExpression("GlobalVariableFirstString",
-                        _("First text child"),
-                        _("Value of the first element of a global array "
-                          "variable, if it is a text (string) variable."),
-                        _("Global variables/Arrays and structures"),
-                        "res/actions/var.png")
-      .AddParameter("globalvar", _("Array variable"));
-
-  extension
-      .AddExpression("GlobalVariableFirstNumber",
-                     _("First number child"),
-                     _("Value of the first element of a global array "
-                       "variable, if it is a number variable"),
-                     _("Global variables/Arrays and structures"),
-                     "res/actions/var.png")
-      .AddParameter("globalvar", _("Array variable"));
-
-  extension
-      .AddStrExpression(
-          "GlobalVariableLastString",
-          _("Last text child"),
-          _("Value of the last element of a global array variable, if "
-            "it is a text (string) variable."),
-          _("Global variables/Arrays and structures"),
-          "res/actions/var.png")
-      .AddParameter("globalvar", _("Array variable"));
-
-  extension
-      .AddExpression(
-          "GlobalVariableLastNumber",
-          _("Last number child"),
-          _("Value of the last element of a global array variable, if "
-            "it is a number variable"),
-          _("Global variables/Arrays and structures"),
-          "res/actions/var.png")
-      .AddParameter("globalvar", _("Array variable"));
-
  extension
      .AddExpression("GlobalVariableChildCount",
-                     _("Number of children"),
-                     _("Number of children in a global array or "
-                       "structure variable"),
-                     _("Global variables/Arrays and structures"),
+                     _("Number of children of a global variable"),
+                     _("Number of children of a global variable"),
+                     _("Global variables"),
                     "res/actions/var.png")
-      .AddParameter("globalvar", _("Array or structure variable"));
+      .AddParameter("globalvar", _("Variable"));

  extension
      .AddExpression("VariableChildCount",
-                     _("Number of children"),
-                     _("Number of children in a scene array or "
-                       "structure variable"),
-                     _("Scene variables/Arrays and structures"),
+                     _("Number of children of a scene variable"),
+                     _("Number of children of a scene variable"),
+                     _("Scene variables"),
                     "res/actions/var.png")
-      .AddParameter("scenevar", _("Array or structure variable"));
+      .AddParameter("scenevar", _("Variable"));

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

  extension
      .AddStrExpression("VariableString",
-                        _("Text variable"),
+                        _("Text of a scene variable"),
                        _("Text of a scene variable"),
                        _("Scene variables"),
                        "res/actions/var.png")
@@ -576,15 +446,15 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(

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

  extension
      .AddStrExpression("GlobalVariableString",
-                        _("Text variable"),
+                        _("Text of a global variable"),
                        _("Text of a global variable"),
                        _("Global variables"),
                        "res/actions/var.png")
--- a/Core/GDCore/Extensions/Builtin/WindowExtension.cpp
+++ b/Core/GDCore/Extensions/Builtin/WindowExtension.cpp
@@ -20,7 +20,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsWindowExtension(
          "these features can be applied.",
          "Florian Rival",
          "Open source (MIT License)")
-      .SetCategory("User interface")
      .SetExtensionHelpPath("/all-features/window");
  extension
      .AddInstructionOrExpressionGroupMetadata(
@@ -56,7 +55,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsWindowExtension(

  extension
      .AddAction("SetWindowMargins",
-                 _("Window's margins"),
+                 _("Change the window's margins"),
                 _("This action changes the margins, in pixels, between the "
                   "game frame and the window borders."),
                 _("Set margins of game window to "
@@ -72,7 +71,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsWindowExtension(

  extension
      .AddAction("SetGameResolutionSize",
-                 _("Game resolution"),
+                 _("Change the resolution of the game"),
                 _("Changes the resolution of the game, effectively changing "
                   "the game area size. This won't change the size of the "
                   "window in which the game is running."),
@@ -87,8 +86,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsWindowExtension(
  extension
      .AddAction(
          "SetWindowSize",
-          _("Game window size"),
-          _("Changes the size of the game window. Note that this "
+          _("Change the size of the game window"),
+          _("This action changes the size of the game window. Note that this "
            "will only work on platform supporting this operation: games "
            "running in browsers or on mobile phones can not update their "
            "window size. Game resolution can still be updated."),
@@ -118,7 +117,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsWindowExtension(

  extension
      .AddAction("SetGameResolutionResizeMode",
-                 _("Game resolution resize mode"),
+                 _("Change the game resolution resize mode"),
                 _("Set if the width or the height of the game resolution "
                   "should be changed to fit the game window - or if the game "
                   "resolution should not be updated automatically."),
@@ -154,7 +153,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsWindowExtension(

  extension
      .AddAction("SetWindowIcon",
-                 _("Window's icon"),
+                 _("Change the window's icon"),
                 _("This action changes the icon of the game's window."),
                 _("Use _PARAM1_ as the icon for the game's window."),
                 "",
@@ -165,7 +164,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsWindowExtension(

  extension
      .AddAction("SetWindowTitle",
-                 _("Window's title"),
+                 _("Change the window's title"),
                 _("This action changes the title of the game's window."),
                 _("Change window title to _PARAM1_"),
                 "",
--- a/Show More
+++ b/Show More